Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-voiceblue.c

diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 52e4a9d69642b5160ea57278435fb9882b587e32..447a586eb33452c11b6891c618b8b3ac9033063b 100644 (file)
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -155,9 +155,9 @@ static struct omap_uart_config voiceblue_uart_config __initdata = {
 };
 
 static struct omap_board_config_kernel voiceblue_config[] = {
-       { OMAP_TAG_USB, &voiceblue_usb_config },
-       { OMAP_TAG_MMC, &voiceblue_mmc_config },
-       { OMAP_TAG_UART,        &voiceblue_uart_config },
+       { OMAP_TAG_USB,  &voiceblue_usb_config },
+       { OMAP_TAG_MMC,  &voiceblue_mmc_config },
+       { OMAP_TAG_UART, &voiceblue_uart_config },
 };
 
 static void __init voiceblue_init_irq(void)
@@ -235,7 +235,7 @@ static struct notifier_block panic_block = {
 static int __init voiceblue_setup(void)
 {
        /* Setup panic notifier */
-       atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
+       notifier_chain_register(&panic_notifier_list, &panic_block);
 
        return 0;
 }