diff options
author | Greg Kroah-Hartman | 2010-06-18 21:13:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-06-18 21:13:11 +0200 |
commit | 178f16db8f24b87fc5f3d16f426ed41c397b96a9 (patch) | |
tree | c0d7639a638da75ea85f1fa2523f2965f1116776 /drivers/staging/Kconfig | |
parent | Staging: vt6655: struct pci_driver cleanup (diff) | |
parent | spectra: Rename config options (diff) | |
download | kernel-qcow2-linux-178f16db8f24b87fc5f3d16f426ed41c397b96a9.tar.gz kernel-qcow2-linux-178f16db8f24b87fc5f3d16f426ed41c397b96a9.tar.xz kernel-qcow2-linux-178f16db8f24b87fc5f3d16f426ed41c397b96a9.zip |
Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 984a75440710..2faff9697467 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" |