1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1cd942abb580..7192b770bfb6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -494,7 +494,7 @@ config FB_TGA
 config FB_VESA
        bool "VESA VGA graphics support"
-        depends on (FB = y) && (X86 || X86_64)
+        depends on (FB = y) && X86
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -712,7 +712,7 @@ config FB_RIVA_DEBUG
 config FB_I810
        tristate "Intel 810/815 support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
        select AGP
        select AGP_INTEL
        select FB_MODE_HELPERS
@@ -761,7 +761,7 @@ config FB_I810_I2C
 config FB_INTEL
        tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
        select AGP
        select AGP_INTEL
        select FB_MODE_HELPERS
@@ -1376,7 +1376,7 @@ config FB_HIT
 config FB_PMAG_AA
        bool "PMAG-AA TURBOchannel framebuffer support"
-        depends on (FB = y) && MACH_DECSTATION && TC
+        depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1387,7 +1387,7 @@ config FB_PMAG_AA
 config FB_PMAG_BA
        bool "PMAG-BA TURBOchannel framebuffer support"
-        depends on (FB = y) && MACH_DECSTATION && TC
+        depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1398,7 +1398,7 @@ config FB_PMAG_BA
 config FB_PMAGB_B
        bool "PMAGB-B TURBOchannel framebuffer support"
-        depends on (FB = y) && MACH_DECSTATION && TC
+        depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1410,7 +1410,7 @@ config FB_PMAGB_B
 config FB_MAXINE
        bool "Maxine (Personal DECstation) onboard framebuffer support"
-        depends on (FB = y) && MACH_DECSTATION && TC
+        depends on (FB = y) && MACH_DECSTATION
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 1cd942abb580..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
@@ -1376,7 +1376,7 @@ config FB_HIT
1376		1376
1377	config FB_PMAG_AA	1377	config FB_PMAG_AA
1378	bool "PMAG-AA TURBOchannel framebuffer support"	1378	bool "PMAG-AA TURBOchannel framebuffer support"
1379	depends on (FB = y) && MACH_DECSTATION && TC	1379	depends on (FB = y) && TC
1380	select FB_CFB_FILLRECT	1380	select FB_CFB_FILLRECT
1381	select FB_CFB_COPYAREA	1381	select FB_CFB_COPYAREA
1382	select FB_CFB_IMAGEBLIT	1382	select FB_CFB_IMAGEBLIT
@@ -1387,7 +1387,7 @@ config FB_PMAG_AA
1387		1387
1388	config FB_PMAG_BA	1388	config FB_PMAG_BA
1389	bool "PMAG-BA TURBOchannel framebuffer support"	1389	bool "PMAG-BA TURBOchannel framebuffer support"
1390	depends on (FB = y) && MACH_DECSTATION && TC	1390	depends on (FB = y) && TC
1391	select FB_CFB_FILLRECT	1391	select FB_CFB_FILLRECT
1392	select FB_CFB_COPYAREA	1392	select FB_CFB_COPYAREA
1393	select FB_CFB_IMAGEBLIT	1393	select FB_CFB_IMAGEBLIT
@@ -1398,7 +1398,7 @@ config FB_PMAG_BA
1398		1398
1399	config FB_PMAGB_B	1399	config FB_PMAGB_B
1400	bool "PMAGB-B TURBOchannel framebuffer support"	1400	bool "PMAGB-B TURBOchannel framebuffer support"
1401	depends on (FB = y) && MACH_DECSTATION && TC	1401	depends on (FB = y) && TC
1402	select FB_CFB_FILLRECT	1402	select FB_CFB_FILLRECT
1403	select FB_CFB_COPYAREA	1403	select FB_CFB_COPYAREA
1404	select FB_CFB_IMAGEBLIT	1404	select FB_CFB_IMAGEBLIT
@@ -1410,7 +1410,7 @@ config FB_PMAGB_B
1410		1410
1411	config FB_MAXINE	1411	config FB_MAXINE
1412	bool "Maxine (Personal DECstation) onboard framebuffer support"	1412	bool "Maxine (Personal DECstation) onboard framebuffer support"
1413	depends on (FB = y) && MACH_DECSTATION && TC	1413	depends on (FB = y) && MACH_DECSTATION
1414	select FB_CFB_FILLRECT	1414	select FB_CFB_FILLRECT
1415	select FB_CFB_COPYAREA	1415	select FB_CFB_COPYAREA
1416	select FB_CFB_IMAGEBLIT	1416	select FB_CFB_IMAGEBLIT