Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index c359fbb..a85074f 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -15,23 +15,26 @@ obj-$(CONFIG_USB_IP_COMMON) += usbip/
 obj-$(CONFIG_W35UND)           += winbond/
 obj-$(CONFIG_PRISM2_USB)       += wlan-ng/
 obj-$(CONFIG_ECHO)             += echo/
-obj-$(CONFIG_OTUS)             += otus/
+obj-$(CONFIG_BRCM80211)                += brcm80211/
 obj-$(CONFIG_RT2860)           += rt2860/
 obj-$(CONFIG_RT2870)           += rt2870/
 obj-$(CONFIG_COMEDI)           += comedi/
+obj-$(CONFIG_FB_OLPC_DCON)     += olpc_dcon/
 obj-$(CONFIG_ASUS_OLED)                += asus_oled/
 obj-$(CONFIG_PANEL)            += panel/
 obj-$(CONFIG_R8187SE)          += rtl8187se/
-obj-$(CONFIG_RTL8192SU)                += rtl8192su/
 obj-$(CONFIG_RTL8192U)         += rtl8192u/
 obj-$(CONFIG_RTL8192E)         += rtl8192e/
+obj-$(CONFIG_R8712U)           += rtl8712/
 obj-$(CONFIG_SPECTRA)          += spectra/
 obj-$(CONFIG_TRANZPORT)                += frontier/
 obj-$(CONFIG_DREAM)            += dream/
 obj-$(CONFIG_POHMELFS)         += pohmelfs/
+obj-$(CONFIG_AUTOFS_FS)                += autofs/
 obj-$(CONFIG_IDE_PHISON)       += phison/
 obj-$(CONFIG_LINE6_USB)                += line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)      += serqt_usb2/
+obj-$(CONFIG_SMB_FS)           += smbfs/
 obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)  += quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
@@ -58,3 +61,11 @@ obj-$(CONFIG_EASYCAP)                += easycap/
 obj-$(CONFIG_SOLO6X10)         += solo6x10/
 obj-$(CONFIG_TIDSPBRIDGE)      += tidspbridge/
 obj-$(CONFIG_ACPI_QUICKSTART)  += quickstart/
+obj-$(CONFIG_WESTBRIDGE_ASTORIA)       += westbridge/astoria/
+obj-$(CONFIG_SBE_2T3E3)        += sbe-2t3e3/
+obj-$(CONFIG_ATH6K_LEGACY)     += ath6kl/
+obj-$(CONFIG_USB_ENESTORAGE)   += keucr/
+obj-$(CONFIG_BCM_WIMAX)        += bcm/
+obj-$(CONFIG_FT1000)           += ft1000/
+obj-$(CONFIG_SND_INTEL_SST)            += intel_sst/
+obj-$(CONFIG_SPEAKUP)  += speakup/