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 7c466e94fd9359f04df7841258adf216878c42d6..7cb8701d96d45639ec7d38a2d0cbd97547ca6ef6 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -12,3 +12,6 @@ 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/