aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-07-30 10:47:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-30 10:47:55 +0100
commit0a52ac8d181e938d640c2da70cad6d1301abe775 (patch)
tree046edf3437a49d3f6989d152bd94fcc80906b86d /drivers/staging/Kconfig
parente81b795d44ba04beab7714de65ed2e377823bd37 (diff)
parent9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff)
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r--drivers/staging/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 348bf61a8fe..975ecddbce3 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -103,8 +103,6 @@ source "drivers/staging/pohmelfs/Kconfig"
source "drivers/staging/stlc45xx/Kconfig"
-source "drivers/staging/uc2322/Kconfig"
-
source "drivers/staging/b3dfg/Kconfig"
source "drivers/staging/phison/Kconfig"