Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index aa61662e6321b8474b24e8c0afb04b491654017b..7cb8701d96d45639ec7d38a2d0cbd97547ca6ef6 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -1,7 +1,17 @@
 # Makefile for staging directory
 
+# fix for build system bug...
+obj-$(CONFIG_STAGING)          += staging.o
+
 obj-$(CONFIG_ET131X)           += et131x/
 obj-$(CONFIG_SLICOSS)          += slicoss/
 obj-$(CONFIG_SXG)              += sxg/
 obj-$(CONFIG_ME4000)           += me4000/
 obj-$(CONFIG_VIDEO_GO7007)     += go7007/
+obj-$(CONFIG_USB_IP_COMMON)    += usbip/
+obj-$(CONFIG_W35UND)           += winbond/
+obj-$(CONFIG_PRISM2_USB)       += wlan-ng/
+obj-$(CONFIG_ECHO)             += echo/
+obj-$(CONFIG_USB_ATMEL)                += at76_usb/
+obj-$(CONFIG_PCC_ACPI)         += pcc-acpi/
+obj-$(CONFIG_POCH)             += poch/