瀏覽代碼

media: move dvb kAPI headers to include/media

Except for DVB, all media kAPI headers are at include/media.

Move the headers to it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Mauro Carvalho Chehab 7 年之前
父節點
當前提交
fada193559
共有 100 個文件被更改,包括 133 次插入140 次删除
  1. 1 1
      Documentation/media/kapi/dtv-ca.rst
  2. 3 3
      Documentation/media/kapi/dtv-common.rst
  3. 4 4
      Documentation/media/kapi/dtv-demux.rst
  4. 4 4
      Documentation/media/kapi/dtv-frontend.rst
  5. 1 1
      Documentation/media/kapi/dtv-net.rst
  6. 0 1
      drivers/media/common/b2c2/Makefile
  7. 4 4
      drivers/media/common/b2c2/flexcop-common.h
  8. 0 4
      drivers/media/common/siano/Makefile
  9. 4 4
      drivers/media/common/siano/smsdvb-debugfs.c
  10. 4 4
      drivers/media/common/siano/smsdvb-main.c
  11. 2 2
      drivers/media/dvb-core/dmxdev.c
  12. 2 2
      drivers/media/dvb-core/dvb_ca_en50221.c
  13. 1 1
      drivers/media/dvb-core/dvb_demux.c
  14. 2 2
      drivers/media/dvb-core/dvb_frontend.c
  15. 1 1
      drivers/media/dvb-core/dvb_math.c
  16. 2 2
      drivers/media/dvb-core/dvb_net.c
  17. 1 1
      drivers/media/dvb-core/dvb_ringbuffer.c
  18. 2 2
      drivers/media/dvb-core/dvb_vb2.c
  19. 1 1
      drivers/media/dvb-core/dvbdev.c
  20. 0 1
      drivers/media/dvb-frontends/Makefile
  21. 1 1
      drivers/media/dvb-frontends/a8293.h
  22. 1 1
      drivers/media/dvb-frontends/af9013_priv.h
  23. 2 2
      drivers/media/dvb-frontends/af9033_priv.h
  24. 1 1
      drivers/media/dvb-frontends/as102_fe.c
  25. 1 1
      drivers/media/dvb-frontends/ascot2e.c
  26. 1 1
      drivers/media/dvb-frontends/atbm8830.c
  27. 1 1
      drivers/media/dvb-frontends/au8522_common.c
  28. 1 1
      drivers/media/dvb-frontends/au8522_dig.c
  29. 1 1
      drivers/media/dvb-frontends/au8522_priv.h
  30. 1 1
      drivers/media/dvb-frontends/bcm3510.c
  31. 1 1
      drivers/media/dvb-frontends/cx22700.c
  32. 1 1
      drivers/media/dvb-frontends/cx22702.c
  33. 1 1
      drivers/media/dvb-frontends/cx24110.c
  34. 1 1
      drivers/media/dvb-frontends/cx24113.c
  35. 1 1
      drivers/media/dvb-frontends/cx24116.c
  36. 1 1
      drivers/media/dvb-frontends/cx24117.c
  37. 1 1
      drivers/media/dvb-frontends/cx24120.c
  38. 1 1
      drivers/media/dvb-frontends/cx24123.c
  39. 2 2
      drivers/media/dvb-frontends/cxd2820r_priv.h
  40. 2 2
      drivers/media/dvb-frontends/cxd2841er.c
  41. 1 1
      drivers/media/dvb-frontends/dib0070.c
  42. 1 1
      drivers/media/dvb-frontends/dib0090.c
  43. 1 1
      drivers/media/dvb-frontends/dib3000mb.c
  44. 1 1
      drivers/media/dvb-frontends/dib3000mc.c
  45. 1 1
      drivers/media/dvb-frontends/dib7000m.c
  46. 2 2
      drivers/media/dvb-frontends/dib7000p.c
  47. 2 2
      drivers/media/dvb-frontends/dib8000.c
  48. 2 2
      drivers/media/dvb-frontends/dib9000.c
  49. 0 1
      drivers/media/dvb-frontends/drx39xyj/Makefile
  50. 1 1
      drivers/media/dvb-frontends/drx39xyj/drx39xxj.h
  51. 1 1
      drivers/media/dvb-frontends/drx39xyj/drxj.c
  52. 1 1
      drivers/media/dvb-frontends/drxd_hard.c
  53. 2 2
      drivers/media/dvb-frontends/drxk_hard.c
  54. 1 1
      drivers/media/dvb-frontends/ds3000.c
  55. 1 1
      drivers/media/dvb-frontends/dvb-pll.h
  56. 1 1
      drivers/media/dvb-frontends/dvb_dummy_fe.c
  57. 1 1
      drivers/media/dvb-frontends/dvb_dummy_fe.h
  58. 1 1
      drivers/media/dvb-frontends/ec100.c
  59. 1 1
      drivers/media/dvb-frontends/gp8psk-fe.c
  60. 1 1
      drivers/media/dvb-frontends/helene.c
  61. 1 1
      drivers/media/dvb-frontends/horus3a.c
  62. 1 1
      drivers/media/dvb-frontends/isl6405.c
  63. 1 1
      drivers/media/dvb-frontends/isl6421.c
  64. 1 1
      drivers/media/dvb-frontends/isl6423.c
  65. 1 1
      drivers/media/dvb-frontends/itd1000.c
  66. 1 1
      drivers/media/dvb-frontends/ix2505v.h
  67. 1 1
      drivers/media/dvb-frontends/l64781.c
  68. 1 1
      drivers/media/dvb-frontends/lg2160.h
  69. 1 1
      drivers/media/dvb-frontends/lgdt3305.c
  70. 1 1
      drivers/media/dvb-frontends/lgdt3305.h
  71. 1 1
      drivers/media/dvb-frontends/lgdt3306a.c
  72. 1 1
      drivers/media/dvb-frontends/lgdt3306a.h
  73. 2 2
      drivers/media/dvb-frontends/lgdt330x.c
  74. 1 1
      drivers/media/dvb-frontends/lgs8gl5.c
  75. 1 1
      drivers/media/dvb-frontends/lgs8gxx.c
  76. 1 1
      drivers/media/dvb-frontends/lnbh25.c
  77. 1 1
      drivers/media/dvb-frontends/lnbp21.c
  78. 1 1
      drivers/media/dvb-frontends/lnbp22.c
  79. 2 2
      drivers/media/dvb-frontends/m88ds3103_priv.h
  80. 1 1
      drivers/media/dvb-frontends/m88rs2000.c
  81. 1 1
      drivers/media/dvb-frontends/m88rs2000.h
  82. 1 1
      drivers/media/dvb-frontends/mb86a16.c
  83. 1 1
      drivers/media/dvb-frontends/mb86a16.h
  84. 1 1
      drivers/media/dvb-frontends/mb86a20s.c
  85. 2 2
      drivers/media/dvb-frontends/mn88472_priv.h
  86. 2 2
      drivers/media/dvb-frontends/mn88473_priv.h
  87. 1 1
      drivers/media/dvb-frontends/mt312.c
  88. 1 1
      drivers/media/dvb-frontends/mt352.c
  89. 1 1
      drivers/media/dvb-frontends/mxl5xx.c
  90. 1 1
      drivers/media/dvb-frontends/mxl5xx.h
  91. 1 1
      drivers/media/dvb-frontends/nxt200x.c
  92. 1 1
      drivers/media/dvb-frontends/nxt6000.c
  93. 2 2
      drivers/media/dvb-frontends/or51132.c
  94. 2 2
      drivers/media/dvb-frontends/or51211.c
  95. 2 2
      drivers/media/dvb-frontends/rtl2830_priv.h
  96. 2 2
      drivers/media/dvb-frontends/rtl2832_priv.h
  97. 1 1
      drivers/media/dvb-frontends/rtl2832_sdr.h
  98. 1 1
      drivers/media/dvb-frontends/s5h1409.c
  99. 1 1
      drivers/media/dvb-frontends/s5h1411.c
  100. 1 1
      drivers/media/dvb-frontends/s5h1420.c

+ 1 - 1
Documentation/media/kapi/dtv-ca.rst

@@ -1,4 +1,4 @@
 Digital TV Conditional Access kABI
 Digital TV Conditional Access kABI
 ----------------------------------
 ----------------------------------
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_ca_en50221.h
+.. kernel-doc:: include/media/dvb_ca_en50221.h

+ 3 - 3
Documentation/media/kapi/dtv-common.rst

@@ -7,7 +7,7 @@ Math functions
 Provide some commonly-used math functions, usually required in order to
 Provide some commonly-used math functions, usually required in order to
 estimate signal strength and signal to noise measurements in dB.
 estimate signal strength and signal to noise measurements in dB.
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_math.h
+.. kernel-doc:: include/media/dvb_math.h
 
 
 
 
 DVB devices
 DVB devices
@@ -15,7 +15,7 @@ DVB devices
 
 
 Those functions are responsible for handling the DVB device nodes.
 Those functions are responsible for handling the DVB device nodes.
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvbdev.h
+.. kernel-doc:: include/media/dvbdev.h
 
 
 Digital TV Ring buffer
 Digital TV Ring buffer
 ~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -52,4 +52,4 @@ copy it from/to userspace.
      Resetting the buffer counts as a read and write operation.
      Resetting the buffer counts as a read and write operation.
      Two or more writers must be locked against each other.
      Two or more writers must be locked against each other.
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_ringbuffer.h
+.. kernel-doc:: include/media/dvb_ringbuffer.h

+ 4 - 4
Documentation/media/kapi/dtv-demux.rst

@@ -8,7 +8,7 @@ The Kernel Digital TV Demux kABI defines a driver-internal interface for
 registering low-level, hardware specific driver to a hardware independent
 registering low-level, hardware specific driver to a hardware independent
 demux layer. It is only of interest for Digital TV device driver writers.
 demux layer. It is only of interest for Digital TV device driver writers.
 The header file for this kABI is named ``demux.h`` and located in
 The header file for this kABI is named ``demux.h`` and located in
-``drivers/media/dvb-core``.
+``include/media``.
 
 
 The demux kABI should be implemented for each demux in the system. It is
 The demux kABI should be implemented for each demux in the system. It is
 used to select the TS source of a demux and to manage the demux resources.
 used to select the TS source of a demux and to manage the demux resources.
@@ -69,14 +69,14 @@ callbacks.
 Digital TV Demux device registration functions and data structures
 Digital TV Demux device registration functions and data structures
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-.. kernel-doc:: drivers/media/dvb-core/dmxdev.h
+.. kernel-doc:: include/media/dmxdev.h
 
 
 High-level Digital TV demux interface
 High-level Digital TV demux interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_demux.h
+.. kernel-doc:: include/media/dvb_demux.h
 
 
 Driver-internal low-level hardware specific driver demux interface
 Driver-internal low-level hardware specific driver demux interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-.. kernel-doc:: drivers/media/dvb-core/demux.h
+.. kernel-doc:: include/media/demux.h

+ 4 - 4
Documentation/media/kapi/dtv-frontend.rst

@@ -8,7 +8,7 @@ The Digital TV Frontend kABI defines a driver-internal interface for
 registering low-level, hardware specific driver to a hardware independent
 registering low-level, hardware specific driver to a hardware independent
 frontend layer. It is only of interest for Digital TV device driver writers.
 frontend layer. It is only of interest for Digital TV device driver writers.
 The header file for this API is named ``dvb_frontend.h`` and located in
 The header file for this API is named ``dvb_frontend.h`` and located in
-``drivers/media/dvb-core``.
+``include/media/``.
 
 
 Demodulator driver
 Demodulator driver
 ^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ The demodulator driver is responsible to talk with the decoding part of the
 hardware. Such driver should implement :c:type:`dvb_frontend_ops`, with
 hardware. Such driver should implement :c:type:`dvb_frontend_ops`, with
 tells what type of digital TV standards are supported, and points to a
 tells what type of digital TV standards are supported, and points to a
 series of functions that allow the DVB core to command the hardware via
 series of functions that allow the DVB core to command the hardware via
-the code under ``drivers/media/dvb-core/dvb_frontend.c``.
+the code under ``include/media/dvb_frontend.c``.
 
 
 A typical example of such struct in a driver ``foo`` is::
 A typical example of such struct in a driver ``foo`` is::
 
 
@@ -118,7 +118,7 @@ Satellite TV reception is::
 
 
 .. |delta|   unicode:: U+00394
 .. |delta|   unicode:: U+00394
 
 
-The ``drivers/media/dvb-core/dvb_frontend.c`` has a kernel thread with is
+The ``include/media/dvb_frontend.c`` has a kernel thread with is
 responsible for tuning the device. It supports multiple algorithms to
 responsible for tuning the device. It supports multiple algorithms to
 detect a channel, as defined at enum :c:func:`dvbfe_algo`.
 detect a channel, as defined at enum :c:func:`dvbfe_algo`.
 
 
@@ -440,4 +440,4 @@ monotonic stats at the right time.
 Digital TV Frontend functions and types
 Digital TV Frontend functions and types
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_frontend.h
+.. kernel-doc:: include/media/dvb_frontend.h

+ 1 - 1
Documentation/media/kapi/dtv-net.rst

@@ -1,4 +1,4 @@
 Digital TV Network kABI
 Digital TV Network kABI
 -----------------------
 -----------------------
 
 
-.. kernel-doc:: drivers/media/dvb-core/dvb_net.h
+.. kernel-doc:: include/media/dvb_net.h

+ 0 - 1
drivers/media/common/b2c2/Makefile

@@ -4,6 +4,5 @@ b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
 b2c2-flexcop-objs += flexcop-hw-filter.o
 b2c2-flexcop-objs += flexcop-hw-filter.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
 
 
-ccflags-y += -Idrivers/media/dvb-core/
 ccflags-y += -Idrivers/media/dvb-frontends/
 ccflags-y += -Idrivers/media/dvb-frontends/
 ccflags-y += -Idrivers/media/tuners/
 ccflags-y += -Idrivers/media/tuners/

+ 4 - 4
drivers/media/common/b2c2/flexcop-common.h

@@ -13,10 +13,10 @@
 
 
 #include "flexcop-reg.h"
 #include "flexcop-reg.h"
 
 
-#include "dmxdev.h"
-#include "dvb_demux.h"
-#include "dvb_net.h"
-#include "dvb_frontend.h"
+#include <media/dmxdev.h>
+#include <media/dvb_demux.h>
+#include <media/dvb_net.h>
+#include <media/dvb_frontend.h>
 
 
 #define FC_MAX_FEED 256
 #define FC_MAX_FEED 256
 
 

+ 0 - 4
drivers/media/common/siano/Makefile

@@ -11,7 +11,3 @@ endif
 ifeq ($(CONFIG_SMS_SIANO_DEBUGFS),y)
 ifeq ($(CONFIG_SMS_SIANO_DEBUGFS),y)
   smsdvb-objs += smsdvb-debugfs.o
   smsdvb-objs += smsdvb-debugfs.o
 endif
 endif
-
-ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
-

+ 4 - 4
drivers/media/common/siano/smsdvb-debugfs.c

@@ -11,10 +11,10 @@
 #include <linux/spinlock.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 
 
-#include "dmxdev.h"
-#include "dvbdev.h"
-#include "dvb_demux.h"
-#include "dvb_frontend.h"
+#include <media/dmxdev.h>
+#include <media/dvbdev.h>
+#include <media/dvb_demux.h>
+#include <media/dvb_frontend.h>
 
 
 #include "smsdvb.h"
 #include "smsdvb.h"
 
 

+ 4 - 4
drivers/media/common/siano/smsdvb-main.c

@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <linux/init.h>
 #include <linux/init.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dmxdev.h"
-#include "dvbdev.h"
-#include "dvb_demux.h"
-#include "dvb_frontend.h"
+#include <media/dmxdev.h>
+#include <media/dvbdev.h>
+#include <media/dvb_demux.h>
+#include <media/dvb_frontend.h>
 
 
 #include "sms-cards.h"
 #include "sms-cards.h"
 
 

+ 2 - 2
drivers/media/dvb-core/dmxdev.c

@@ -27,8 +27,8 @@
 #include <linux/ioctl.h>
 #include <linux/ioctl.h>
 #include <linux/wait.h>
 #include <linux/wait.h>
 #include <linux/uaccess.h>
 #include <linux/uaccess.h>
-#include "dmxdev.h"
-#include "dvb_vb2.h"
+#include <media/dmxdev.h>
+#include <media/dvb_vb2.h>
 
 
 static int debug;
 static int debug;
 
 

+ 2 - 2
drivers/media/dvb-core/dvb_ca_en50221.c

@@ -37,8 +37,8 @@
 #include <linux/sched/signal.h>
 #include <linux/sched/signal.h>
 #include <linux/kthread.h>
 #include <linux/kthread.h>
 
 
-#include "dvb_ca_en50221.h"
-#include "dvb_ringbuffer.h"
+#include <media/dvb_ca_en50221.h>
+#include <media/dvb_ringbuffer.h>
 
 
 static int dvb_ca_en50221_debug;
 static int dvb_ca_en50221_debug;
 
 

+ 1 - 1
drivers/media/dvb-core/dvb_demux.c

@@ -30,7 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/uaccess.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_demux.h"
+#include <media/dvb_demux.h>
 
 
 static int dvb_demux_tscheck;
 static int dvb_demux_tscheck;
 module_param(dvb_demux_tscheck, int, 0644);
 module_param(dvb_demux_tscheck, int, 0644);

+ 2 - 2
drivers/media/dvb-core/dvb_frontend.c

@@ -43,8 +43,8 @@
 #include <linux/compat.h>
 #include <linux/compat.h>
 #include <asm/processor.h>
 #include <asm/processor.h>
 
 
-#include "dvb_frontend.h"
-#include "dvbdev.h"
+#include <media/dvb_frontend.h>
+#include <media/dvbdev.h>
 #include <linux/dvb/version.h>
 #include <linux/dvb/version.h>
 
 
 static int dvb_frontend_debug;
 static int dvb_frontend_debug;

+ 1 - 1
drivers/media/dvb-core/dvb_math.c

@@ -19,7 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/module.h>
 #include <asm/bug.h>
 #include <asm/bug.h>
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 
 
 static const unsigned short logtable[256] = {
 static const unsigned short logtable[256] = {
 	0x0000, 0x0171, 0x02e0, 0x044e, 0x05ba, 0x0725, 0x088e, 0x09f7,
 	0x0000, 0x0171, 0x02e0, 0x044e, 0x05ba, 0x0725, 0x088e, 0x09f7,

+ 2 - 2
drivers/media/dvb-core/dvb_net.c

@@ -64,8 +64,8 @@
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/sched.h>
 
 
-#include "dvb_demux.h"
-#include "dvb_net.h"
+#include <media/dvb_demux.h>
+#include <media/dvb_net.h>
 
 
 static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
 static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
 {
 {

+ 1 - 1
drivers/media/dvb-core/dvb_ringbuffer.c

@@ -29,7 +29,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/uaccess.h>
 
 
-#include "dvb_ringbuffer.h"
+#include <media/dvb_ringbuffer.h>
 
 
 #define PKT_READY 0
 #define PKT_READY 0
 #define PKT_DISPOSED 1
 #define PKT_DISPOSED 1

+ 2 - 2
drivers/media/dvb-core/dvb_vb2.c

@@ -16,8 +16,8 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/mm.h>
 
 
-#include "dvbdev.h"
-#include "dvb_vb2.h"
+#include <media/dvbdev.h>
+#include <media/dvb_vb2.h>
 
 
 #define DVB_V2_MAX_SIZE		(4096 * 188)
 #define DVB_V2_MAX_SIZE		(4096 * 188)
 
 

+ 1 - 1
drivers/media/dvb-core/dvbdev.c

@@ -30,7 +30,7 @@
 #include <linux/fs.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include <linux/cdev.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
-#include "dvbdev.h"
+#include <media/dvbdev.h>
 
 
 /* Due to enum tuner_pad_index */
 /* Due to enum tuner_pad_index */
 #include <media/tuner.h>
 #include <media/tuner.h>

+ 0 - 1
drivers/media/dvb-frontends/Makefile

@@ -3,7 +3,6 @@
 # Makefile for the kernel DVB frontend device drivers.
 # Makefile for the kernel DVB frontend device drivers.
 #
 #
 
 
-ccflags-y += -I$(srctree)/drivers/media/dvb-core/
 ccflags-y += -I$(srctree)/drivers/media/tuners/
 ccflags-y += -I$(srctree)/drivers/media/tuners/
 
 
 # FIXME: RTL2832 SDR driver uses power management directly from USB IF driver
 # FIXME: RTL2832 SDR driver uses power management directly from USB IF driver

+ 1 - 1
drivers/media/dvb-frontends/a8293.h

@@ -17,7 +17,7 @@
 #ifndef A8293_H
 #ifndef A8293_H
 #define A8293_H
 #define A8293_H
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 /*
 /*
  * I2C address
  * I2C address

+ 1 - 1
drivers/media/dvb-frontends/af9013_priv.h

@@ -21,7 +21,7 @@
 #ifndef AF9013_PRIV_H
 #ifndef AF9013_PRIV_H
 #define AF9013_PRIV_H
 #define AF9013_PRIV_H
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "af9013.h"
 #include "af9013.h"
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 #include <linux/math64.h>
 #include <linux/math64.h>

+ 2 - 2
drivers/media/dvb-frontends/af9033_priv.h

@@ -18,12 +18,12 @@
 #ifndef AF9033_PRIV_H
 #ifndef AF9033_PRIV_H
 #define AF9033_PRIV_H
 #define AF9033_PRIV_H
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "af9033.h"
 #include "af9033.h"
 #include <linux/math64.h>
 #include <linux/math64.h>
 #include <linux/regmap.h>
 #include <linux/regmap.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 
 
 struct reg_val {
 struct reg_val {
 	u32 reg;
 	u32 reg;

+ 1 - 1
drivers/media/dvb-frontends/as102_fe.c

@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  * GNU General Public License for more details.
  */
  */
 
 
-#include <dvb_frontend.h>
+#include <media/dvb_frontend.h>
 
 
 #include "as102_fe.h"
 #include "as102_fe.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/ascot2e.c

@@ -24,7 +24,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include "ascot2e.h"
 #include "ascot2e.h"
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #define MAX_WRITE_REGSIZE 10
 #define MAX_WRITE_REGSIZE 10
 
 

+ 1 - 1
drivers/media/dvb-frontends/atbm8830.c

@@ -16,7 +16,7 @@
  */
  */
 
 
 #include <asm/div64.h>
 #include <asm/div64.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "atbm8830.h"
 #include "atbm8830.h"
 #include "atbm8830_priv.h"
 #include "atbm8830_priv.h"

+ 1 - 1
drivers/media/dvb-frontends/au8522_common.c

@@ -23,7 +23,7 @@
 */
 */
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "au8522_priv.h"
 #include "au8522_priv.h"
 
 
 static int debug;
 static int debug;

+ 1 - 1
drivers/media/dvb-frontends/au8522_dig.c

@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/delay.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "au8522.h"
 #include "au8522.h"
 #include "au8522_priv.h"
 #include "au8522_priv.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/au8522_priv.h

@@ -32,7 +32,7 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-mc.h>
 #include <media/v4l2-mc.h>
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "au8522.h"
 #include "au8522.h"
 #include "tuner-i2c.h"
 #include "tuner-i2c.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/bcm3510.c

@@ -40,7 +40,7 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "bcm3510.h"
 #include "bcm3510.h"
 #include "bcm3510_priv.h"
 #include "bcm3510_priv.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/cx22700.c

@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx22700.h"
 #include "cx22700.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/cx22702.c

@@ -31,7 +31,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/delay.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx22702.h"
 #include "cx22702.h"
 
 
 struct cx22702_state {
 struct cx22702_state {

+ 1 - 1
drivers/media/dvb-frontends/cx24110.c

@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/init.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24110.h"
 #include "cx24110.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/cx24113.c

@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/init.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24113.h"
 #include "cx24113.h"
 
 
 static int debug;
 static int debug;

+ 1 - 1
drivers/media/dvb-frontends/cx24116.c

@@ -41,7 +41,7 @@
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24116.h"
 #include "cx24116.h"
 
 
 static int debug;
 static int debug;

+ 1 - 1
drivers/media/dvb-frontends/cx24117.c

@@ -32,7 +32,7 @@
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 
 
 #include "tuner-i2c.h"
 #include "tuner-i2c.h"
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24117.h"
 #include "cx24117.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/cx24120.c

@@ -29,7 +29,7 @@
 #include <linux/moduleparam.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24120.h"
 #include "cx24120.h"
 
 
 #define CX24120_SEARCH_RANGE_KHZ 5000
 #define CX24120_SEARCH_RANGE_KHZ 5000

+ 1 - 1
drivers/media/dvb-frontends/cx24123.c

@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <linux/init.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "cx24123.h"
 #include "cx24123.h"
 
 
 #define XTAL 10111000
 #define XTAL 10111000

+ 2 - 2
drivers/media/dvb-frontends/cxd2820r_priv.h

@@ -23,8 +23,8 @@
 #define CXD2820R_PRIV_H
 #define CXD2820R_PRIV_H
 
 
 #include <linux/dvb/version.h>
 #include <linux/dvb/version.h>
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "cxd2820r.h"
 #include "cxd2820r.h"
 #include <linux/gpio.h>
 #include <linux/gpio.h>
 #include <linux/math64.h>
 #include <linux/math64.h>

+ 2 - 2
drivers/media/dvb-frontends/cxd2841er.c

@@ -31,8 +31,8 @@
 #include <linux/dynamic_debug.h>
 #include <linux/dynamic_debug.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 
 
-#include "dvb_math.h"
-#include "dvb_frontend.h"
+#include <media/dvb_math.h>
+#include <media/dvb_frontend.h>
 #include "cxd2841er.h"
 #include "cxd2841er.h"
 #include "cxd2841er_priv.h"
 #include "cxd2841er_priv.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/dib0070.c

@@ -27,7 +27,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib0070.h"
 #include "dib0070.h"
 #include "dibx000_common.h"
 #include "dibx000_common.h"

+ 1 - 1
drivers/media/dvb-frontends/dib0090.c

@@ -27,7 +27,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib0090.h"
 #include "dib0090.h"
 #include "dibx000_common.h"
 #include "dibx000_common.h"

+ 1 - 1
drivers/media/dvb-frontends/dib3000mb.c

@@ -30,7 +30,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib3000.h"
 #include "dib3000.h"
 #include "dib3000mb_priv.h"
 #include "dib3000mb_priv.h"

+ 1 - 1
drivers/media/dvb-frontends/dib3000mc.c

@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib3000mc.h"
 #include "dib3000mc.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/dib7000m.c

@@ -16,7 +16,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib7000m.h"
 #include "dib7000m.h"
 
 

+ 2 - 2
drivers/media/dvb-frontends/dib7000p.c

@@ -16,8 +16,8 @@
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_math.h"
-#include "dvb_frontend.h"
+#include <media/dvb_math.h>
+#include <media/dvb_frontend.h>
 
 
 #include "dib7000p.h"
 #include "dib7000p.h"
 
 

+ 2 - 2
drivers/media/dvb-frontends/dib8000.c

@@ -16,9 +16,9 @@
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "dib8000.h"
 #include "dib8000.h"
 
 

+ 2 - 2
drivers/media/dvb-frontends/dib9000.c

@@ -14,8 +14,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
-#include "dvb_math.h"
-#include "dvb_frontend.h"
+#include <media/dvb_math.h>
+#include <media/dvb_frontend.h>
 
 
 #include "dib9000.h"
 #include "dib9000.h"
 #include "dibx000_common.h"
 #include "dibx000_common.h"

+ 0 - 1
drivers/media/dvb-frontends/drx39xyj/Makefile

@@ -2,5 +2,4 @@ drx39xyj-objs := drxj.o
 
 
 obj-$(CONFIG_DVB_DRX39XYJ) += drx39xyj.o
 obj-$(CONFIG_DVB_DRX39XYJ) += drx39xyj.o
 
 
-ccflags-y += -I$(srctree)/drivers/media/dvb-core/
 ccflags-y += -I$(srctree)/drivers/media/tuners/
 ccflags-y += -I$(srctree)/drivers/media/tuners/

+ 1 - 1
drivers/media/dvb-frontends/drx39xyj/drx39xxj.h

@@ -19,7 +19,7 @@
 #define DRX39XXJ_H
 #define DRX39XXJ_H
 
 
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "drx_driver.h"
 #include "drx_driver.h"
 
 
 struct drx39xxj_state {
 struct drx39xxj_state {

+ 1 - 1
drivers/media/dvb-frontends/drx39xyj/drxj.c

@@ -61,7 +61,7 @@ INCLUDE FILES
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "drx39xxj.h"
 #include "drx39xxj.h"
 
 
 #include "drxj.h"
 #include "drxj.h"

+ 1 - 1
drivers/media/dvb-frontends/drxd_hard.c

@@ -26,7 +26,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "drxd.h"
 #include "drxd.h"
 #include "drxd_firm.h"
 #include "drxd_firm.h"
 
 

+ 2 - 2
drivers/media/dvb-frontends/drxk_hard.c

@@ -29,10 +29,10 @@
 #include <linux/hardirq.h>
 #include <linux/hardirq.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "drxk.h"
 #include "drxk.h"
 #include "drxk_hard.h"
 #include "drxk_hard.h"
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 
 
 static int power_down_dvbt(struct drxk_state *state, bool set_power_mode);
 static int power_down_dvbt(struct drxk_state *state, bool set_power_mode);
 static int power_down_qam(struct drxk_state *state);
 static int power_down_qam(struct drxk_state *state);

+ 1 - 1
drivers/media/dvb-frontends/ds3000.c

@@ -26,7 +26,7 @@
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "ts2020.h"
 #include "ts2020.h"
 #include "ds3000.h"
 #include "ds3000.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/dvb-pll.h

@@ -7,7 +7,7 @@
 #define __DVB_PLL_H__
 #define __DVB_PLL_H__
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #define DVB_PLL_UNDEFINED               0
 #define DVB_PLL_UNDEFINED               0
 #define DVB_PLL_THOMSON_DTT7579         1
 #define DVB_PLL_THOMSON_DTT7579         1

+ 1 - 1
drivers/media/dvb-frontends/dvb_dummy_fe.c

@@ -20,7 +20,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "dvb_dummy_fe.h"
 #include "dvb_dummy_fe.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/dvb_dummy_fe.h

@@ -19,7 +19,7 @@
 #define DVB_DUMMY_FE_H
 #define DVB_DUMMY_FE_H
 
 
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #if IS_REACHABLE(CONFIG_DVB_DUMMY_FE)
 #if IS_REACHABLE(CONFIG_DVB_DUMMY_FE)
 extern struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void);
 extern struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void);

+ 1 - 1
drivers/media/dvb-frontends/ec100.c

@@ -15,7 +15,7 @@
  *
  *
  */
  */
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "ec100.h"
 #include "ec100.h"
 
 
 struct ec100_state {
 struct ec100_state {

+ 1 - 1
drivers/media/dvb-frontends/gp8psk-fe.c

@@ -16,7 +16,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 
 #include "gp8psk-fe.h"
 #include "gp8psk-fe.h"
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 static int debug;
 static int debug;
 module_param(debug, int, 0644);
 module_param(debug, int, 0644);

+ 1 - 1
drivers/media/dvb-frontends/helene.c

@@ -23,7 +23,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include "helene.h"
 #include "helene.h"
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #define MAX_WRITE_REGSIZE 20
 #define MAX_WRITE_REGSIZE 20
 
 

+ 1 - 1
drivers/media/dvb-frontends/horus3a.c

@@ -24,7 +24,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include "horus3a.h"
 #include "horus3a.h"
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #define MAX_WRITE_REGSIZE      5
 #define MAX_WRITE_REGSIZE      5
 
 

+ 1 - 1
drivers/media/dvb-frontends/isl6405.c

@@ -29,7 +29,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "isl6405.h"
 #include "isl6405.h"
 
 
 struct isl6405 {
 struct isl6405 {

+ 1 - 1
drivers/media/dvb-frontends/isl6421.c

@@ -29,7 +29,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "isl6421.h"
 #include "isl6421.h"
 
 
 struct isl6421 {
 struct isl6421 {

+ 1 - 1
drivers/media/dvb-frontends/isl6423.c

@@ -26,7 +26,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "isl6423.h"
 #include "isl6423.h"
 
 
 static unsigned int verbose;
 static unsigned int verbose;

+ 1 - 1
drivers/media/dvb-frontends/itd1000.c

@@ -22,7 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "itd1000.h"
 #include "itd1000.h"
 #include "itd1000_priv.h"
 #include "itd1000_priv.h"

+ 1 - 1
drivers/media/dvb-frontends/ix2505v.h

@@ -17,7 +17,7 @@
 #define DVB_IX2505V_H
 #define DVB_IX2505V_H
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 /**
 /**
  * struct ix2505v_config - ix2505 attachment configuration
  * struct ix2505v_config - ix2505 attachment configuration

+ 1 - 1
drivers/media/dvb-frontends/l64781.c

@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "l64781.h"
 #include "l64781.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/lg2160.h

@@ -19,7 +19,7 @@
 #define _LG2160_H_
 #define _LG2160_H_
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 enum lg_chip_type {
 enum lg_chip_type {
 	LG2160 = 0,
 	LG2160 = 0,

+ 1 - 1
drivers/media/dvb-frontends/lgdt3305.c

@@ -20,7 +20,7 @@
 #include <asm/div64.h>
 #include <asm/div64.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 #include "lgdt3305.h"
 #include "lgdt3305.h"
 
 
 static int debug;
 static int debug;

+ 1 - 1
drivers/media/dvb-frontends/lgdt3305.h

@@ -19,7 +19,7 @@
 #define _LGDT3305_H_
 #define _LGDT3305_H_
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 
 
 enum lgdt3305_mpeg_mode {
 enum lgdt3305_mpeg_mode {

+ 1 - 1
drivers/media/dvb-frontends/lgdt3306a.c

@@ -21,7 +21,7 @@
 #include <asm/div64.h>
 #include <asm/div64.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 #include "lgdt3306a.h"
 #include "lgdt3306a.h"
 #include <linux/i2c-mux.h>
 #include <linux/i2c-mux.h>
 
 

+ 1 - 1
drivers/media/dvb-frontends/lgdt3306a.h

@@ -19,7 +19,7 @@
 #define _LGDT3306A_H_
 #define _LGDT3306A_H_
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 
 
 enum lgdt3306a_mpeg_mode {
 enum lgdt3306a_mpeg_mode {

+ 2 - 2
drivers/media/dvb-frontends/lgdt330x.c

@@ -37,8 +37,8 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 
 
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "lgdt330x_priv.h"
 #include "lgdt330x_priv.h"
 #include "lgdt330x.h"
 #include "lgdt330x.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/lgs8gl5.c

@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "lgs8gl5.h"
 #include "lgs8gl5.h"
 
 
 
 

+ 1 - 1
drivers/media/dvb-frontends/lgs8gxx.c

@@ -22,7 +22,7 @@
 #include <asm/div64.h>
 #include <asm/div64.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 #include "lgs8gxx.h"
 #include "lgs8gxx.h"
 #include "lgs8gxx_priv.h"
 #include "lgs8gxx_priv.h"

+ 1 - 1
drivers/media/dvb-frontends/lnbh25.c

@@ -23,7 +23,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "lnbh25.h"
 #include "lnbh25.h"
 
 
 /**
 /**

+ 1 - 1
drivers/media/dvb-frontends/lnbp21.c

@@ -29,7 +29,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "lnbp21.h"
 #include "lnbp21.h"
 #include "lnbh24.h"
 #include "lnbh24.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/lnbp22.c

@@ -30,7 +30,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "lnbp22.h"
 #include "lnbp22.h"
 
 
 static int debug;
 static int debug;

+ 2 - 2
drivers/media/dvb-frontends/m88ds3103_priv.h

@@ -17,9 +17,9 @@
 #ifndef M88DS3103_PRIV_H
 #ifndef M88DS3103_PRIV_H
 #define M88DS3103_PRIV_H
 #define M88DS3103_PRIV_H
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "m88ds3103.h"
 #include "m88ds3103.h"
-#include "dvb_math.h"
+#include <media/dvb_math.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 #include <linux/i2c-mux.h>
 #include <linux/i2c-mux.h>
 #include <linux/regmap.h>
 #include <linux/regmap.h>

+ 1 - 1
drivers/media/dvb-frontends/m88rs2000.c

@@ -31,7 +31,7 @@
 #include <linux/types.h>
 #include <linux/types.h>
 
 
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "m88rs2000.h"
 #include "m88rs2000.h"
 
 
 struct m88rs2000_state {
 struct m88rs2000_state {

+ 1 - 1
drivers/media/dvb-frontends/m88rs2000.h

@@ -21,7 +21,7 @@
 #define M88RS2000_H
 #define M88RS2000_H
 
 
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 struct m88rs2000_config {
 struct m88rs2000_config {
 	/* Demodulator i2c address */
 	/* Demodulator i2c address */

+ 1 - 1
drivers/media/dvb-frontends/mb86a16.c

@@ -24,7 +24,7 @@
 #include <linux/moduleparam.h>
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "mb86a16.h"
 #include "mb86a16.h"
 #include "mb86a16_priv.h"
 #include "mb86a16_priv.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/mb86a16.h

@@ -22,7 +22,7 @@
 #define __MB86A16_H
 #define __MB86A16_H
 
 
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/frontend.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 
 
 struct mb86a16_config {
 struct mb86a16_config {

+ 1 - 1
drivers/media/dvb-frontends/mb86a20s.c

@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "mb86a20s.h"
 #include "mb86a20s.h"
 
 
 #define NUM_LAYERS 3
 #define NUM_LAYERS 3

+ 2 - 2
drivers/media/dvb-frontends/mn88472_priv.h

@@ -17,8 +17,8 @@
 #ifndef MN88472_PRIV_H
 #ifndef MN88472_PRIV_H
 #define MN88472_PRIV_H
 #define MN88472_PRIV_H
 
 
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "mn88472.h"
 #include "mn88472.h"
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 #include <linux/regmap.h>
 #include <linux/regmap.h>

+ 2 - 2
drivers/media/dvb-frontends/mn88473_priv.h

@@ -17,8 +17,8 @@
 #ifndef MN88473_PRIV_H
 #ifndef MN88473_PRIV_H
 #define MN88473_PRIV_H
 #define MN88473_PRIV_H
 
 
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "mn88473.h"
 #include "mn88473.h"
 #include <linux/math64.h>
 #include <linux/math64.h>
 #include <linux/firmware.h>
 #include <linux/firmware.h>

+ 1 - 1
drivers/media/dvb-frontends/mt312.c

@@ -32,7 +32,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "mt312_priv.h"
 #include "mt312_priv.h"
 #include "mt312.h"
 #include "mt312.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/mt352.c

@@ -33,7 +33,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "mt352_priv.h"
 #include "mt352_priv.h"
 #include "mt352.h"
 #include "mt352.h"
 
 

+ 1 - 1
drivers/media/dvb-frontends/mxl5xx.c

@@ -33,7 +33,7 @@
 #include <asm/div64.h>
 #include <asm/div64.h>
 #include <asm/unaligned.h>
 #include <asm/unaligned.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "mxl5xx.h"
 #include "mxl5xx.h"
 #include "mxl5xx_regs.h"
 #include "mxl5xx_regs.h"
 #include "mxl5xx_defs.h"
 #include "mxl5xx_defs.h"

+ 1 - 1
drivers/media/dvb-frontends/mxl5xx.h

@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <linux/types.h>
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 struct mxl5xx_cfg {
 struct mxl5xx_cfg {
 	u8   adr;
 	u8   adr;

+ 1 - 1
drivers/media/dvb-frontends/nxt200x.c

@@ -48,7 +48,7 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/string.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "nxt200x.h"
 #include "nxt200x.h"
 
 
 struct nxt200x_state {
 struct nxt200x_state {

+ 1 - 1
drivers/media/dvb-frontends/nxt6000.c

@@ -27,7 +27,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "nxt6000_priv.h"
 #include "nxt6000_priv.h"
 #include "nxt6000.h"
 #include "nxt6000.h"
 
 

+ 2 - 2
drivers/media/dvb-frontends/or51132.c

@@ -38,8 +38,8 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 
 
-#include "dvb_math.h"
-#include "dvb_frontend.h"
+#include <media/dvb_math.h>
+#include <media/dvb_frontend.h>
 #include "or51132.h"
 #include "or51132.h"
 
 
 static int debug;
 static int debug;

+ 2 - 2
drivers/media/dvb-frontends/or51211.c

@@ -36,8 +36,8 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 
 
-#include "dvb_math.h"
-#include "dvb_frontend.h"
+#include <media/dvb_math.h>
+#include <media/dvb_frontend.h>
 #include "or51211.h"
 #include "or51211.h"
 
 
 static int debug;
 static int debug;

+ 2 - 2
drivers/media/dvb-frontends/rtl2830_priv.h

@@ -18,8 +18,8 @@
 #ifndef RTL2830_PRIV_H
 #ifndef RTL2830_PRIV_H
 #define RTL2830_PRIV_H
 #define RTL2830_PRIV_H
 
 
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "rtl2830.h"
 #include "rtl2830.h"
 #include <linux/i2c-mux.h>
 #include <linux/i2c-mux.h>
 #include <linux/math64.h>
 #include <linux/math64.h>

+ 2 - 2
drivers/media/dvb-frontends/rtl2832_priv.h

@@ -26,8 +26,8 @@
 #include <linux/math64.h>
 #include <linux/math64.h>
 #include <linux/bitops.h>
 #include <linux/bitops.h>
 
 
-#include "dvb_frontend.h"
-#include "dvb_math.h"
+#include <media/dvb_frontend.h>
+#include <media/dvb_math.h>
 #include "rtl2832.h"
 #include "rtl2832.h"
 
 
 struct rtl2832_dev {
 struct rtl2832_dev {

+ 1 - 1
drivers/media/dvb-frontends/rtl2832_sdr.h

@@ -27,7 +27,7 @@
 
 
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-subdev.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 
 
 /**
 /**
  * struct rtl2832_sdr_platform_data - Platform data for the rtl2832_sdr driver
  * struct rtl2832_sdr_platform_data - Platform data for the rtl2832_sdr driver

+ 1 - 1
drivers/media/dvb-frontends/s5h1409.c

@@ -25,7 +25,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/delay.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "s5h1409.h"
 #include "s5h1409.h"
 
 
 struct s5h1409_state {
 struct s5h1409_state {

+ 1 - 1
drivers/media/dvb-frontends/s5h1411.c

@@ -25,7 +25,7 @@
 #include <linux/string.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/delay.h>
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "s5h1411.h"
 #include "s5h1411.h"
 
 
 struct s5h1411_state {
 struct s5h1411_state {

+ 1 - 1
drivers/media/dvb-frontends/s5h1420.c

@@ -30,7 +30,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 
 
 
 
-#include "dvb_frontend.h"
+#include <media/dvb_frontend.h>
 #include "s5h1420.h"
 #include "s5h1420.h"
 #include "s5h1420_priv.h"
 #include "s5h1420_priv.h"
 
 

Some files were not shown because too many files changed in this diff