diff options
author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-17 17:10:40 +0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-17 17:10:40 +0300 |
commit | aea983801c6b5e4e9af333a32220d580a77f6783 (patch) | |
tree | 6d389d49e2485e9e22e211544aed9e8f59264cc9 /drivers/media/usb/dvb-usb | |
parent | 11a1e0ed7908f04c896e69d0eb65e478c12f8519 (diff) | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
download | linux-aea983801c6b5e4e9af333a32220d580a77f6783.tar.xz |
Merge tag 'v4.9-rc1' into patchwork
Linux 4.9-rc1
* tag 'v4.9-rc1': (13774 commits)
Linux 4.9-rc1
score: traps: Add missing include file to fix build error
fs/super.c: don't fool lockdep in freeze_super() and thaw_super() paths
fs/super.c: fix race between freeze_super() and thaw_super()
overlayfs: Fix setting IOP_XATTR flag
iov_iter: kernel-doc import_iovec() and rw_copy_check_uvector()
CIFS: Retrieve uid and gid from special sid if enabled
CIFS: Add new mount option to set owner uid and gid from special sids in acl
qedr: Add events support and register IB device
qedr: Add GSI support
qedr: Add LL2 RoCE interface
qedr: Add support for data path
qedr: Add support for memory registeration verbs
qedr: Add support for QP verbs
qedr: Add support for PD,PKEY and CQ verbs
qedr: Add support for user context verbs
qedr: Add support for RoCE HW init
qedr: Add RoCE driver framework
pkeys: Remove easily triggered WARN
MIPS: Wire up new pkey_{mprotect,alloc,free} syscalls
...
Diffstat (limited to 'drivers/media/usb/dvb-usb')
-rw-r--r-- | drivers/media/usb/dvb-usb/dibusb-common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c index b0fd9a609352..de3ee2547479 100644 --- a/drivers/media/usb/dvb-usb/dibusb-common.c +++ b/drivers/media/usb/dvb-usb/dibusb-common.c @@ -9,7 +9,6 @@ * see Documentation/dvb/README.dvb-usb for more information */ -#include <linux/kconfig.h> #include "dibusb.h" /* Max transfer size done by I2C transfer functions */ |