Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8cbf1ae..7719d04 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -44,3 +44,8 @@ obj-$(CONFIG_VME_BUS)         += vme/
 obj-$(CONFIG_RAR_REGISTER)     += rar/
 obj-$(CONFIG_DX_SEP)           += sep/
 obj-$(CONFIG_IIO)              += iio/
+obj-$(CONFIG_STRIP)            += strip/
+obj-$(CONFIG_ARLAN)            += arlan/
+obj-$(CONFIG_WAVELAN)          += wavelan/
+obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan/
+obj-$(CONFIG_PCMCIA_NETWAVE)   += netwave/