Merge branch 'topic/aoa' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8948a0e575a84c5f84dccc4c702a000428da669c..47a56f5ffabcc5d0bedb75a4651f4a3882241a75 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_ET131X)            += et131x/
 obj-$(CONFIG_SLICOSS)          += slicoss/
 obj-$(CONFIG_SXG)              += sxg/
 obj-$(CONFIG_ME4000)           += me4000/
+obj-$(CONFIG_MEILHAUS)         += meilhaus/
 obj-$(CONFIG_VIDEO_GO7007)     += go7007/
 obj-$(CONFIG_USB_IP_COMMON)    += usbip/
 obj-$(CONFIG_W35UND)           += winbond/
@@ -17,5 +18,14 @@ obj-$(CONFIG_POCH)           += poch/
 obj-$(CONFIG_AGNX)             += agnx/
 obj-$(CONFIG_OTUS)             += otus/
 obj-$(CONFIG_RT2860)           += rt2860/
-obj-$(CONFIG_BENET)            += benet/
+obj-$(CONFIG_RT2870)           += rt2870/
 obj-$(CONFIG_COMEDI)           += comedi/
+obj-$(CONFIG_ASUS_OLED)                += asus_oled/
+obj-$(CONFIG_PANEL)            += panel/
+obj-$(CONFIG_ALTERA_PCIE_CHDMA)        += altpciechdma/
+obj-$(CONFIG_RTL8187SE)                += rtl8187se/
+obj-$(CONFIG_USB_RSPI)         += rspiusb/
+obj-$(CONFIG_INPUT_MIMIO)      += mimio/
+obj-$(CONFIG_TRANZPORT)                += frontier/
+obj-$(CONFIG_EPL)              += epl/
+obj-$(CONFIG_ANDROID)          += android/