diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:48:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:48:32 -0700 |
| commit | fb20871a54961b82d35303b43452928186c1361d (patch) | |
| tree | 1beeb39e45eda1c8b5893090904b583fceeb07ef /drivers/staging/Kconfig | |
| parent | bee89ab228e6f51c4ddd3481b9bd491859a8ee7b (diff) | |
| parent | c7a5d70796379e3d51d0c652fbe1634b81d3bbd5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (342 commits)
Staging: comedi: fix build errors
Staging: udlfb: update to version 0.2.3
Staging: udlfb: fix some sparse warnings.
Staging: udlfb: clean up checkpatch warnings in udlfb.c
Staging: udlfb: clean up checkpatch warnings in udlfb.h
Staging: udlfb: add udlfb driver to build
Staging: add udlfb driver
Staging: pata_rdc: remove pointless comments
Staging: pata_rdc: remove DRIVER macros
Staging: pata_rdc: remove dbgprintf macro
Staging: pata_rdc: remove broken flag
Staging: pata_rdc: fix build warnings
Staging: pata_rdc: use PCI_DEVICE
Staging: pata_rdc: remove function prototypes
Staging: pata_rdc: coding style fixes
Staging: pata_rdc: convert code to work in 2.6.29
Staging: pata_rdc: add driver to the build system
Staging: add pata_rdc driver
Staging: remove obsolete serqt_usb driver
Staging: serqt_usb2 add the driver to the build
...
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 925657889f0..348bf61a8fe 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -85,6 +85,8 @@ source "drivers/staging/altpciechdma/Kconfig" source "drivers/staging/rtl8187se/Kconfig" +source "drivers/staging/rtl8192su/Kconfig" + source "drivers/staging/rspiusb/Kconfig" source "drivers/staging/mimio/Kconfig" @@ -113,11 +115,19 @@ source "drivers/staging/heci/Kconfig" source "drivers/staging/line6/Kconfig" -source "drivers/staging/serqt_usb/Kconfig" - source "drivers/gpu/drm/radeon/Kconfig" source "drivers/staging/octeon/Kconfig" +source "drivers/staging/serqt_usb2/Kconfig" + +source "drivers/staging/vt6655/Kconfig" + +source "drivers/staging/cpc-usb/Kconfig" + +source "drivers/staging/pata_rdc/Kconfig" + +source "drivers/staging/udlfb/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |