Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353663
b: refs/heads/master
c: d1d3422
h: refs/heads/master
i:
  353661: e6452ee
  353659: d0fc9b6
  353655: dc459dc
  353647: 1b36932
  353631: b4666c9
  353599: e5f6da4
  353535: d3e4fdc
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent d99f678 commit 648a7ac
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43893cbefc1b79c94b4809535000c7a306b77360
refs/heads/master: d1d34224f436323ece698eba7063e2a818e2f80e
26 changes: 13 additions & 13 deletions trunk/drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1112,8 +1112,8 @@ config FB_RIVA_BACKLIGHT
Say Y here if you want to control the backlight of your display.

config FB_I740
tristate "Intel740 support (EXPERIMENTAL)"
depends on EXPERIMENTAL && FB && PCI
tristate "Intel740 support"
depends on FB && PCI
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
Expand All @@ -1124,8 +1124,8 @@ config FB_I740
This driver supports graphics cards based on Intel740 chip.

config FB_I810
tristate "Intel 810/815 support (EXPERIMENTAL)"
depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
tristate "Intel 810/815 support"
depends on FB && PCI && X86_32 && AGP_INTEL
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
Expand Down Expand Up @@ -1187,8 +1187,8 @@ config FB_CARILLO_RANCH
This driver supports the LE80578 (Carillo Ranch) board

config FB_INTEL
tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EXPERT
tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support"
depends on FB && PCI && X86 && AGP_INTEL && EXPERT
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
Expand Down Expand Up @@ -1432,7 +1432,7 @@ config FB_ATY_CT
is at <http://support.ati.com/products/pc/mach64/mach64.html>.

config FB_ATY_GENERIC_LCD
bool "Mach64 generic LCD support (EXPERIMENTAL)"
bool "Mach64 generic LCD support"
depends on FB_ATY_CT
help
Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
Expand Down Expand Up @@ -1479,7 +1479,7 @@ config FB_S3_DDC

config FB_SAVAGE
tristate "S3 Savage support"
depends on FB && PCI && EXPERIMENTAL
depends on FB && PCI
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
Expand Down Expand Up @@ -1633,15 +1633,15 @@ config FB_3DFX
module will be called tdfxfb.

config FB_3DFX_ACCEL
bool "3Dfx Acceleration functions (EXPERIMENTAL)"
depends on FB_3DFX && EXPERIMENTAL
bool "3Dfx Acceleration functions"
depends on FB_3DFX
---help---
This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
device driver with acceleration functions.

config FB_3DFX_I2C
bool "Enable DDC/I2C support"
depends on FB_3DFX && EXPERIMENTAL
depends on FB_3DFX
select FB_DDC
default y
help
Expand Down Expand Up @@ -1714,8 +1714,8 @@ config FB_ARK
and ICS 5342 RAMDAC.

config FB_PM3
tristate "Permedia3 support (EXPERIMENTAL)"
depends on FB && PCI && EXPERIMENTAL
tristate "Permedia3 support"
depends on FB && PCI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
Expand Down

0 comments on commit 648a7ac

Please sign in to comment.