diff options
author | Brian Gerst <bgerst@didntduck.org> | 2005-10-30 17:59:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:10 -0500 |
commit | 0d078f6f96809c95c69b99d6605a502b0ac63d3d (patch) | |
tree | 1b4691abab5f96f2aa8a5217a2701f181b41940d /drivers/video | |
parent | 4276d32260662d5401a15a0a46e506fb5c8ab563 (diff) |
[PATCH] CONFIG_IA32
Add CONFIG_X86_32 for i386. This allows selecting options that only apply
to 32-bit systems.
(X86 && !X86_64) becomes X86_32
(X86 || X86_64) becomes X86
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/Kconfig | 6 | ||||
-rw-r--r-- | drivers/video/console/Kconfig | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7e297947a2b2..7192b770bfb6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -494,7 +494,7 @@ config FB_TGA | |||
494 | 494 | ||
495 | config FB_VESA | 495 | config FB_VESA |
496 | bool "VESA VGA graphics support" | 496 | bool "VESA VGA graphics support" |
497 | depends on (FB = y) && (X86 || X86_64) | 497 | depends on (FB = y) && X86 |
498 | select FB_CFB_FILLRECT | 498 | select FB_CFB_FILLRECT |
499 | select FB_CFB_COPYAREA | 499 | select FB_CFB_COPYAREA |
500 | select FB_CFB_IMAGEBLIT | 500 | select FB_CFB_IMAGEBLIT |
@@ -712,7 +712,7 @@ config FB_RIVA_DEBUG | |||
712 | 712 | ||
713 | config FB_I810 | 713 | config FB_I810 |
714 | tristate "Intel 810/815 support (EXPERIMENTAL)" | 714 | tristate "Intel 810/815 support (EXPERIMENTAL)" |
715 | depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64 | 715 | depends on FB && EXPERIMENTAL && PCI && X86_32 |
716 | select AGP | 716 | select AGP |
717 | select AGP_INTEL | 717 | select AGP_INTEL |
718 | select FB_MODE_HELPERS | 718 | select FB_MODE_HELPERS |
@@ -761,7 +761,7 @@ config FB_I810_I2C | |||
761 | 761 | ||
762 | config FB_INTEL | 762 | config FB_INTEL |
763 | tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)" | 763 | tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)" |
764 | depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64 | 764 | depends on FB && EXPERIMENTAL && PCI && X86_32 |
765 | select AGP | 765 | select AGP |
766 | select AGP_INTEL | 766 | select AGP_INTEL |
767 | select FB_MODE_HELPERS | 767 | select FB_MODE_HELPERS |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 7e731691e2a9..6a9ae2b3d1ab 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -28,7 +28,7 @@ config VGA_CONSOLE | |||
28 | 28 | ||
29 | config VIDEO_SELECT | 29 | config VIDEO_SELECT |
30 | bool "Video mode selection support" | 30 | bool "Video mode selection support" |
31 | depends on (X86 || X86_64) && VGA_CONSOLE | 31 | depends on X86 && VGA_CONSOLE |
32 | ---help--- | 32 | ---help--- |
33 | This enables support for text mode selection on kernel startup. If | 33 | This enables support for text mode selection on kernel startup. If |
34 | you want to take advantage of some high-resolution text mode your | 34 | you want to take advantage of some high-resolution text mode your |