aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-22 10:08:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-22 10:08:40 -0700
commit3eb9992caff10b62cf0ed0bcb1667a58b13188fa (patch)
treeabe4b4b586978773e2df21898eda611bc6eb822c /drivers/staging/Makefile
parente347fa5f4271769bc31fb462631c213aa3824588 (diff)
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
downloadlinux-stericsson-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.tar.gz
Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already in Linus's tree. 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 3860be7ee90d..35edbe293631 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
obj-$(CONFIG_PANEL) += panel/
-obj-$(CONFIG_R8187SE) += rtl8187se/
obj-$(CONFIG_RTL8192U) += rtl8192u/
obj-$(CONFIG_RTL8192E) += rtl8192e/
obj-$(CONFIG_R8712U) += rtl8712/