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

[pandora-kernel.git] / drivers / staging / Kconfig

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index bdc632b..e2d5869 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -119,6 +119,8 @@ source "drivers/staging/vme/Kconfig"
 
 source "drivers/staging/memrar/Kconfig"
 
 
 source "drivers/staging/memrar/Kconfig"
 

+source "drivers/staging/sep/Kconfig"
+

 source "drivers/staging/iio/Kconfig"
 
 source "drivers/staging/zram/Kconfig"
 source "drivers/staging/iio/Kconfig"
 
 source "drivers/staging/zram/Kconfig"


@@ -127,8 +129,6 @@ source "drivers/staging/wlags49_h2/Kconfig"
 
 source "drivers/staging/wlags49_h25/Kconfig"
 
 
 source "drivers/staging/wlags49_h25/Kconfig"
 

-source "drivers/staging/batman-adv/Kconfig"
-

 source "drivers/staging/samsung-laptop/Kconfig"
 
 source "drivers/staging/sm7xx/Kconfig"
 source "drivers/staging/samsung-laptop/Kconfig"
 
 source "drivers/staging/sm7xx/Kconfig"


@@ -141,8 +141,6 @@ source "drivers/staging/cxt1e1/Kconfig"
 
 source "drivers/staging/ti-st/Kconfig"
 
 
 source "drivers/staging/ti-st/Kconfig"
 

-source "drivers/staging/adis16255/Kconfig"
-

 source "drivers/staging/xgifb/Kconfig"
 
 source "drivers/staging/msm/Kconfig"
 source "drivers/staging/xgifb/Kconfig"
 
 source "drivers/staging/msm/Kconfig"


@@ -175,5 +173,9 @@ source "drivers/staging/intel_sst/Kconfig"
 
 source "drivers/staging/speakup/Kconfig"
 
 
 source "drivers/staging/speakup/Kconfig"
 

+source "drivers/staging/cptm1217/Kconfig"
+
+source "drivers/staging/ste_rmi4/Kconfig"
+

 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING