diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 12:13:11 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 12:13:11 -0700 |
commit | 178f16db8f24b87fc5f3d16f426ed41c397b96a9 (patch) | |
tree | c0d7639a638da75ea85f1fa2523f2965f1116776 /drivers/staging/Makefile | |
parent | 013a468c4504738856d67118492ce7b7fff53a48 (diff) | |
parent | bf46b9a92e45044d0b41beed61ae118e560dd3e4 (diff) | |
download | talos-obmc-linux-178f16db8f24b87fc5f3d16f426ed41c397b96a9.tar.gz talos-obmc-linux-178f16db8f24b87fc5f3d16f426ed41c397b96a9.zip |
Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 9fa25133874a..6d21710d3311 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_R8187SE) += rtl8187se/ obj-$(CONFIG_RTL8192SU) += rtl8192su/ obj-$(CONFIG_RTL8192U) += rtl8192u/ obj-$(CONFIG_RTL8192E) += rtl8192e/ +obj-$(CONFIG_SPECTRA) += spectra/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_DREAM) += dream/ obj-$(CONFIG_POHMELFS) += pohmelfs/ |