diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:54:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 21:01:40 +0100 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/Kconfig | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 975ecddbce3..10d3fcffe91 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -45,12 +45,6 @@ source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" -source "drivers/staging/sxg/Kconfig" - -source "drivers/staging/me4000/Kconfig" - -source "drivers/staging/meilhaus/Kconfig" - source "drivers/staging/go7007/Kconfig" source "drivers/staging/usbip/Kconfig" @@ -61,8 +55,6 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" -source "drivers/staging/at76_usb/Kconfig" - source "drivers/staging/poch/Kconfig" source "drivers/staging/agnx/Kconfig" @@ -73,7 +65,7 @@ source "drivers/staging/rt2860/Kconfig" source "drivers/staging/rt2870/Kconfig" -source "drivers/staging/rt3070/Kconfig" +source "drivers/staging/rt3090/Kconfig" source "drivers/staging/comedi/Kconfig" @@ -87,16 +79,16 @@ source "drivers/staging/rtl8187se/Kconfig" source "drivers/staging/rtl8192su/Kconfig" -source "drivers/staging/rspiusb/Kconfig" +source "drivers/staging/rtl8192e/Kconfig" source "drivers/staging/mimio/Kconfig" source "drivers/staging/frontier/Kconfig" -source "drivers/staging/epl/Kconfig" - source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig" @@ -109,8 +101,6 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/p9auth/Kconfig" -source "drivers/staging/heci/Kconfig" - source "drivers/staging/line6/Kconfig" source "drivers/gpu/drm/radeon/Kconfig" @@ -119,13 +109,27 @@ source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig" +source "drivers/staging/quatech_usb2/Kconfig" + source "drivers/staging/vt6655/Kconfig" -source "drivers/staging/cpc-usb/Kconfig" +source "drivers/staging/vt6656/Kconfig" -source "drivers/staging/pata_rdc/Kconfig" +source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/hv/Kconfig" + +source "drivers/staging/vme/Kconfig" + +source "drivers/staging/rar/Kconfig" + +source "drivers/staging/sep/Kconfig" + +source "drivers/staging/iio/Kconfig" + +source "drivers/staging/cowloop/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |