aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorKsenija Stanojevic <ksenija.stanojevic@gmail.com>2016-02-03 12:31:49 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 14:14:22 -0800
commit305b37bd01c220a7a6285911d43c9884270257be (patch)
tree9fa3c74fb619acd4a4f2cbc6fba23426a39cb90c /drivers/staging/Makefile
parentMerge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next (diff)
downloadlinux-dev-305b37bd01c220a7a6285911d43c9884270257be.tar.xz
linux-dev-305b37bd01c220a7a6285911d43c9884270257be.zip
misc: Move panel driver out of staging
Move panel driver from drivers/staging/panel to drivers/misc. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> Acked-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 ba160f1ec02d..dbab17e9d45c 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,7 +7,6 @@ obj-y += media/
obj-$(CONFIG_SLICOSS) += slicoss/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/
-obj-$(CONFIG_PANEL) += panel/
obj-$(CONFIG_RTL8192U) += rtl8192u/
obj-$(CONFIG_RTL8192E) += rtl8192e/
obj-$(CONFIG_R8712U) += rtl8712/