Pull cpuidle into release branch

[pandora-kernel.git] / arch / arm / mach-footbridge / cats-hw.c

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86..c261472 100644 (file)
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -8,7 +8,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 
 #include <asm/hardware/dec21285.h>
 #include <asm/io.h>
@@ -78,18 +78,19 @@ static void __init
 fixup_cats(struct machine_desc *desc, struct tag *tags,
           char **cmdline, struct meminfo *mi)
 {
-       ORIG_VIDEO_LINES  = 25;
-       ORIG_VIDEO_POINTS = 16;
-       ORIG_Y = 24;
+       screen_info.orig_video_lines  = 25;
+       screen_info.orig_video_points = 16;
+       screen_info.orig_y = 24;
 }
 
 MACHINE_START(CATS, "Chalice-CATS")
-       MAINTAINER("Philip Blundell")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       SOFT_REBOOT
-       FIXUP(fixup_cats)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Philip Blundell */
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .soft_reboot    = 1,
+       .fixup          = fixup_cats,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END