summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorSven Eckelmann2010-12-16 23:28:17 +0100
committerGreg Kroah-Hartman2010-12-17 00:20:05 +0100
commit63d5e5a727240b317b0c2fa2abeb32b367aea196 (patch)
tree2ad3bd8296e3cc8704112d8e03395572980e7f80 /drivers/staging/Makefile
parentStaging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on in... (diff)
downloadkernel-qcow2-linux-63d5e5a727240b317b0c2fa2abeb32b367aea196.tar.gz
kernel-qcow2-linux-63d5e5a727240b317b0c2fa2abeb32b367aea196.tar.xz
kernel-qcow2-linux-63d5e5a727240b317b0c2fa2abeb32b367aea196.zip
Staging: batman-adv: Remove batman-adv from staging
batman-adv is now moved to net/batman-adv/ and can be removed from staging. Signed-off-by: Sven Eckelmann <sven@narfation.org> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 10c72bb1940d..4e6797f6444a 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_ZRAM) += zram/
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
-obj-$(CONFIG_BATMAN_ADV) += batman-adv/
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop/
obj-$(CONFIG_FB_SM7XX) += sm7xx/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/