linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / cirrusfb.c

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 1103010..e0dbdfc 100644 (file)
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -60,8 +60,8 @@
 #include <asm/amigahw.h>
 #endif
 #ifdef CONFIG_PPC_PREP
-#include <asm/machdep.h>
-#define isPReP (machine_is(prep))
+#include <asm/processor.h>
+#define isPReP (_machine == _MACH_prep)
 #else
 #define isPReP 0
 #endif
@@ -2622,7 +2622,7 @@ static int __init cirrusfb_init(void)
 #endif
 
 #ifdef CONFIG_ZORRO
-       error |= zorro_register_driver(&cirrusfb_zorro_driver);
+       error |= zorro_module_init(&cirrusfb_zorro_driver);
 #endif
 #ifdef CONFIG_PCI
        error |= pci_register_driver(&cirrusfb_pci_driver);