From: Andrew Morton <akpm@osdl.org>

Cc: Michael Neuling <mikey@neuling.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/alpha/kernel/setup.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/alpha/kernel/setup.c~input-pcspkr-device-and-driver-separation-fix-2 arch/alpha/kernel/setup.c
--- 25-alpha/arch/alpha/kernel/setup.c~input-pcspkr-device-and-driver-separation-fix-2	2006-02-28 01:41:12.000000000 -0800
+++ 25-alpha-akpm/arch/alpha/kernel/setup.c	2006-02-28 01:41:12.000000000 -0800
@@ -1491,8 +1491,8 @@ static __init int add_pcspkr(void)
 	struct platform_device *pd;
 
 	pd = platform_device_alloc("pcspkr", -1);
-	BUGON(!pd);
-	BUGON(platform_device_add(pd));
+	BUG_ON(!pd);
+	BUG_ON(platform_device_add(pd));
 
 	return 0;
 }
_