diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:00:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:00:30 -0400 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /arch/arm | |
| parent | cbfee34520666862f8ff539e580c48958fbb7706 (diff) | |
| parent | 3ea335100014785fd2518461705654b200e58d00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
Remove magic macros for screen_info structure members
[x86] remove uses of magic macros for boot_params access
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-footbridge/cats-hw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index ef6ccc8993e..c261472208c 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c | |||
| @@ -78,9 +78,9 @@ static void __init | |||
| 78 | fixup_cats(struct machine_desc *desc, struct tag *tags, | 78 | fixup_cats(struct machine_desc *desc, struct tag *tags, |
| 79 | char **cmdline, struct meminfo *mi) | 79 | char **cmdline, struct meminfo *mi) |
| 80 | { | 80 | { |
| 81 | ORIG_VIDEO_LINES = 25; | 81 | screen_info.orig_video_lines = 25; |
| 82 | ORIG_VIDEO_POINTS = 16; | 82 | screen_info.orig_video_points = 16; |
| 83 | ORIG_Y = 24; | 83 | screen_info.orig_y = 24; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | MACHINE_START(CATS, "Chalice-CATS") | 86 | MACHINE_START(CATS, "Chalice-CATS") |