summaryrefslogtreecommitdiff
path: root/drivers/media/usb/dvb-usb-v2/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-06-05 00:53:02 +0400
committerRalf Baechle <ralf@linux-mips.org>2014-06-05 00:53:02 +0400
commitf8647b506d7116a1a3accd8d618184096e85f50b (patch)
treef10bc7201fda2a36c035548a0ea62210ad57adb6 /drivers/media/usb/dvb-usb-v2/Makefile
parent1d421ca9d7edbac1eb118631ee039d50ab54771e (diff)
parentf7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff)
downloadlinux-f8647b506d7116a1a3accd8d618184096e85f50b.tar.xz
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/Makefile')
-rw-r--r--drivers/media/usb/dvb-usb-v2/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
index 7407b8338ccf..bc38f03394cd 100644
--- a/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/drivers/media/usb/dvb-usb-v2/Makefile
@@ -41,4 +41,3 @@ ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/tuners
ccflags-y += -I$(srctree)/drivers/media/common
-ccflags-y += -I$(srctree)/drivers/staging/media/rtl2832u_sdr