Linux 2.6.28-rc4

[linux-2.6-omap-h63xx.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 ef6ccc8993e96c2082489075cd712372006c417e..6a5b437ab86ffdfd03c66527ea2331bfa4f4c7d9 100644 (file)
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -9,9 +9,9 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/screen_info.h>
+#include <linux/io.h>
 
 #include <asm/hardware/dec21285.h>
-#include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 
@@ -78,9 +78,9 @@ 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")