aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-06-18 12:13:11 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-18 12:13:11 -0700
commit178f16db8f24b87fc5f3d16f426ed41c397b96a9 (patch)
treec0d7639a638da75ea85f1fa2523f2965f1116776 /drivers/staging/Kconfig
parent013a468c4504738856d67118492ce7b7fff53a48 (diff)
parentbf46b9a92e45044d0b41beed61ae118e560dd3e4 (diff)
downloadkernel_samsung_smdk4412-178f16db8f24b87fc5f3d16f426ed41c397b96a9.zip
kernel_samsung_smdk4412-178f16db8f24b87fc5f3d16f426ed41c397b96a9.tar.gz
kernel_samsung_smdk4412-178f16db8f24b87fc5f3d16f426ed41c397b96a9.tar.bz2
Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r--drivers/staging/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 984a754..2faff96 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -97,6 +97,8 @@ source "drivers/staging/octeon/Kconfig"
source "drivers/staging/serqt_usb2/Kconfig"
+source "drivers/staging/spectra/Kconfig"
+
source "drivers/staging/quatech_usb2/Kconfig"
source "drivers/staging/vt6655/Kconfig"