diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:00:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:00:30 +0200 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /arch/arm | |
| parent | security/ cleanups (diff) | |
| parent | Remove magic macros for screen_info structure members (diff) | |
| download | linux-5c8e191e8437616a498a8e1cc0af3dd0d32bbff2.tar.xz linux-5c8e191e8437616a498a8e1cc0af3dd0d32bbff2.zip | |
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 ef6ccc8993e9..c261472208cb 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c @@ -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") |