git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
49b898a
..
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/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>
#include <asm/hardware/dec21285.h>
#include <asm/io.h>
@@
-78,14
+78,13
@@
static void __init
fixup_cats(struct machine_desc *desc, struct tag *tags,
char **cmdline, struct meminfo *mi)
{
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 */
}
MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
- .phys_ram = 0x00000000,
.phys_io = DC21285_ARMCSR_BASE,
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.phys_io = DC21285_ARMCSR_BASE,
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
.boot_params = 0x00000100,