aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 09:00:30 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 09:00:30 -0700
commit5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch)
tree78ed04467e3bd034eaa9696cdf8d668ba7e16381 /include/linux
parentcbfee34520666862f8ff539e580c48958fbb7706 (diff)
parent3ea335100014785fd2518461705654b200e58d00 (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.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 3ee412bc00e..ba81ffe9958 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -47,15 +47,6 @@ struct screen_info {
extern struct screen_info screen_info;
-#define ORIG_X (screen_info.orig_x)
-#define ORIG_Y (screen_info.orig_y)
-#define ORIG_VIDEO_MODE (screen_info.orig_video_mode)
-#define ORIG_VIDEO_COLS (screen_info.orig_video_cols)
-#define ORIG_VIDEO_EGA_BX (screen_info.orig_video_ega_bx)
-#define ORIG_VIDEO_LINES (screen_info.orig_video_lines)
-#define ORIG_VIDEO_ISVGA (screen_info.orig_video_isVGA)
-#define ORIG_VIDEO_POINTS (screen_info.orig_video_points)
-
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
#define VIDEO_TYPE_CGA 0x11 /* CGA Display */
#define VIDEO_TYPE_EGAM 0x20 /* EGA/VGA in Monochrome Mode */