linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ppc / platforms / prep_setup.c

diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 1cb75a1..d065358 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -1,4 +1,6 @@
 /*
+ *  arch/ppc/platforms/setup.c
+ *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -11,6 +13,7 @@
  * bootup setup stuff..
  */
 
+#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -23,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
-#include <linux/screen_info.h>
+#include <linux/tty.h>
 #include <linux/major.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
@@ -735,7 +738,7 @@ ibm_statusled_progress(char *s, unsigned short hex)
                hex = 0xfff;
                if (!notifier_installed) {
                        ++notifier_installed;
-                       atomic_notifier_chain_register(&panic_notifier_list,
+                       notifier_chain_register(&panic_notifier_list,
                                                &ibm_statusled_block);
                }
        }
@@ -1066,13 +1069,15 @@ prep_map_io(void)
 static int __init
 prep_request_io(void)
 {
+       if (_machine == _MACH_prep) {
 #ifdef CONFIG_NVRAM
-       request_region(PREP_NVRAM_AS0, 0x8, "nvram");
+               request_region(PREP_NVRAM_AS0, 0x8, "nvram");
 #endif
-       request_region(0x00,0x20,"dma1");
-       request_region(0x40,0x20,"timer");
-       request_region(0x80,0x10,"dma page reg");
-       request_region(0xc0,0x20,"dma2");
+               request_region(0x00,0x20,"dma1");
+               request_region(0x40,0x20,"timer");
+               request_region(0x80,0x10,"dma page reg");
+               request_region(0xc0,0x20,"dma2");
+       }
 
        return 0;
 }