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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/screen_info.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 3ee412bc00ec..ba81ffe9958a 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h | |||
| @@ -47,15 +47,6 @@ struct screen_info { | |||
| 47 | 47 | ||
| 48 | extern struct screen_info screen_info; | 48 | extern struct screen_info screen_info; |
| 49 | 49 | ||
| 50 | #define ORIG_X (screen_info.orig_x) | ||
| 51 | #define ORIG_Y (screen_info.orig_y) | ||
| 52 | #define ORIG_VIDEO_MODE (screen_info.orig_video_mode) | ||
| 53 | #define ORIG_VIDEO_COLS (screen_info.orig_video_cols) | ||
| 54 | #define ORIG_VIDEO_EGA_BX (screen_info.orig_video_ega_bx) | ||
| 55 | #define ORIG_VIDEO_LINES (screen_info.orig_video_lines) | ||
| 56 | #define ORIG_VIDEO_ISVGA (screen_info.orig_video_isVGA) | ||
| 57 | #define ORIG_VIDEO_POINTS (screen_info.orig_video_points) | ||
| 58 | |||
| 59 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ | 50 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ |
| 60 | #define VIDEO_TYPE_CGA 0x11 /* CGA Display */ | 51 | #define VIDEO_TYPE_CGA 0x11 /* CGA Display */ |
| 61 | #define VIDEO_TYPE_EGAM 0x20 /* EGA/VGA in Monochrome Mode */ | 52 | #define VIDEO_TYPE_EGAM 0x20 /* EGA/VGA in Monochrome Mode */ |