Commit 7cbc3013 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: cxd2880: Fix location of DVB headers

Fix a trivial conflict, where the location of DVB headers
got moved.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 55e13167
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation
*/ */
#include "dvb_frontend.h" #include <media/dvb_frontend.h>
#include "cxd2880_common.h" #include "cxd2880_common.h"
#include "cxd2880_tnrdmd.h" #include "cxd2880_tnrdmd.h"
#include "cxd2880_tnrdmd_mon.h" #include "cxd2880_tnrdmd_mon.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation
*/ */
#include "dvb_frontend.h" #include <media/dvb_frontend.h>
#include "cxd2880_tnrdmd_dvbt.h" #include "cxd2880_tnrdmd_dvbt.h"
#include "cxd2880_tnrdmd_dvbt_mon.h" #include "cxd2880_tnrdmd_dvbt_mon.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation
*/ */
#include "dvb_frontend.h" #include <media/dvb_frontend.h>
#include "cxd2880_tnrdmd_dvbt2.h" #include "cxd2880_tnrdmd_dvbt2.h"
#include "cxd2880_tnrdmd_dvbt2_mon.h" #include "cxd2880_tnrdmd_dvbt2_mon.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "cxd2880_tnrdmd_dvbt2.h" #include "cxd2880_tnrdmd_dvbt2.h"
#include "cxd2880_tnrdmd_dvbt2_mon.h" #include "cxd2880_tnrdmd_dvbt2_mon.h"
#include "dvb_math.h" #include <media/dvb_math.h>
static const int ref_dbm_1000[4][8] = { static const int ref_dbm_1000[4][8] = {
{-96000, -95000, -94000, -93000, -92000, -92000, -98000, -97000}, {-96000, -95000, -94000, -93000, -92000, -92000, -98000, -97000},
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "cxd2880_tnrdmd_dvbt.h" #include "cxd2880_tnrdmd_dvbt.h"
#include "cxd2880_tnrdmd_dvbt_mon.h" #include "cxd2880_tnrdmd_dvbt_mon.h"
#include "dvb_math.h" #include <media/dvb_math.h>
static const int ref_dbm_1000[3][5] = { static const int ref_dbm_1000[3][5] = {
{-93000, -91000, -90000, -89000, -88000}, {-93000, -91000, -90000, -89000, -88000},
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "dvb_frontend.h" #include <media/dvb_frontend.h>
#include "dvb_math.h" #include <media/dvb_math.h>
#include "cxd2880.h" #include "cxd2880.h"
#include "cxd2880_tnrdmd_mon.h" #include "cxd2880_tnrdmd_mon.h"
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/ktime.h> #include <linux/ktime.h>
#include "dvb_demux.h" #include <media/dvb_demux.h>
#include "dmxdev.h" #include <media/dmxdev.h>
#include "dvb_frontend.h" #include <media/dvb_frontend.h>
#include "cxd2880.h" #include "cxd2880.h"
#define CXD2880_MAX_FILTER_SIZE 32 #define CXD2880_MAX_FILTER_SIZE 32
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment