Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~shefty/rdma-dev.git] / drivers / staging / Kconfig

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 923e28f83208bb548cc7d2702352d07d67b14996..e2d586903432256963aeff291b6bc10f46997d12 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -51,9 +51,11 @@ source "drivers/staging/cx25821/Kconfig"
 
 source "drivers/staging/tm6000/Kconfig"
 
 
 source "drivers/staging/tm6000/Kconfig"
 

-source "drivers/staging/cpia/Kconfig"
+source "drivers/staging/dabusb/Kconfig"

 
 

-source "drivers/staging/stradis/Kconfig"
+source "drivers/staging/se401/Kconfig"
+
+source "drivers/staging/usbvideo/Kconfig"

 
 source "drivers/staging/usbip/Kconfig"
 
 
 source "drivers/staging/usbip/Kconfig"
 


@@ -111,8 +113,6 @@ source "drivers/staging/vt6655/Kconfig"
 
 source "drivers/staging/vt6656/Kconfig"
 
 
 source "drivers/staging/vt6656/Kconfig"
 

-source "drivers/staging/udlfb/Kconfig"
-

 source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"
 source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"