git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] powerpc: Allow for ppc_md restart, power_off, and halt to be NULL
[safe/jmp/linux-2.6]
/
drivers
/
video
/
Kconfig
diff --git
a/drivers/video/Kconfig
b/drivers/video/Kconfig
index
25b6ca6
..
3e153d3
100644
(file)
--- a/
drivers/video/Kconfig
+++ b/
drivers/video/Kconfig
@@
-534,9
+534,15
@@
config FB_SUN3
bool "Sun3 framebuffer support"
depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
bool "Sun3 framebuffer support"
depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
+config FB_SBUS
+ bool "SBUS and UPA framebuffers"
+ depends on (FB = y) && SPARC
+ help
+ Say Y if you want support for SBUS or UPA based frame buffer device.
+
config FB_BW2
bool "BWtwo support"
config FB_BW2
bool "BWtwo support"
- depends on (FB = y) && (
(SPARC32 || SPARC64)
&& FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && (
SPARC
&& FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@
-545,7
+551,8
@@
config FB_BW2
config FB_CG3
bool "CGthree support"
config FB_CG3
bool "CGthree support"
- depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
@@
-553,7
+560,7
@@
config FB_CG3
config FB_CG6
bool "CGsix (GX,TurboGX) support"
config FB_CG6
bool "CGsix (GX,TurboGX) support"
- depends on (FB = y) && (
(SPARC32 || SPARC64)
&& FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && (
SPARC
&& FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
@@
-986,12
+993,6
@@
config FB_ATY_GENERIC_LCD
Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
Rage XC, or Rage XL chipset.
Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
Rage XC, or Rage XL chipset.
-config FB_ATY_XL_INIT
- bool "Rage XL No-BIOS Init support"
- depends on FB_ATY_CT
- help
- Say Y here to support booting a Rage XL without BIOS support.
-
config FB_ATY_GX
bool "Mach64 GX support" if PCI
depends on FB_ATY
config FB_ATY_GX
bool "Mach64 GX support" if PCI
depends on FB_ATY
@@
-1144,7
+1145,7
@@
config FB_VOODOO1
config FB_CYBLA
tristate "Cyberblade/i1 support"
config FB_CYBLA
tristate "Cyberblade/i1 support"
- depends on FB && PCI
+ depends on FB && PCI
&& X86_32 && !64BIT
select FB_CFB_IMAGEBLIT
select VIDEO_SELECT
---help---
select FB_CFB_IMAGEBLIT
select VIDEO_SELECT
---help---
@@
-1210,12
+1211,6
@@
config FB_AU1100
source "drivers/video/geode/Kconfig"
source "drivers/video/geode/Kconfig"
-config FB_SBUS
- bool "SBUS and UPA framebuffers"
- depends on (FB = y) && (SPARC32 || SPARC64)
- help
- Say Y if you want support for SBUS or UPA based frame buffer device.
-
config FB_FFB
bool "Creator/Creator3D/Elite3D support"
depends on FB_SBUS && SPARC64
config FB_FFB
bool "Creator/Creator3D/Elite3D support"
depends on FB_SBUS && SPARC64
@@
-1267,7
+1262,7
@@
config FB_LEO
config FB_PCI
bool "PCI framebuffers"
config FB_PCI
bool "PCI framebuffers"
- depends on (FB = y) && PCI &&
(SPARC64 || SPARC32)
+ depends on (FB = y) && PCI &&
SPARC
config FB_IGA
bool "IGA 168x display support"
config FB_IGA
bool "IGA 168x display support"
@@
-1375,7
+1370,7
@@
config FB_PXA
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want). The
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want). The
- module will be called
v
fb. If you want to compile it as a module,
+ module will be called
pxa
fb. If you want to compile it as a module,
say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
@@
-1408,7
+1403,7
@@
config FB_W100
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want). The
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want). The
- module will be called
v
fb. If you want to compile it as a module,
+ module will be called
w100
fb. If you want to compile it as a module,
say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
say M here and read <file:Documentation/modules.txt>.
If unsure, say N.