From c2ba9726c342d113bdc36cfd8e984e30498037c6 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Tue, 26 Aug 2014 00:08:16 -0300 Subject: [PATCH] [media] it913x: rename tuner_it913x => it913x Remove tuner_ prefix from module name and file names. Prefix was added due to file name conflict on media out-tree build system. Demodulator having same name does not exists anymore. So lets remove dumb prefix. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- drivers/media/tuners/Makefile | 2 +- drivers/media/tuners/{tuner_it913x.c => it913x.c} | 2 +- drivers/media/tuners/{tuner_it913x.h => it913x.h} | 0 drivers/media/tuners/{tuner_it913x_priv.h => it913x_priv.h} | 2 +- drivers/media/usb/dvb-usb-v2/af9035.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename drivers/media/tuners/{tuner_it913x.c => it913x.c} (99%) rename drivers/media/tuners/{tuner_it913x.h => it913x.h} (100%) rename drivers/media/tuners/{tuner_it913x_priv.h => it913x_priv.h} (99%) diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index 5591699755ba..7eede5cd9906 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_MEDIA_TUNER_M88TS2022) += m88ts2022.o obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o -obj-$(CONFIG_MEDIA_TUNER_IT913X) += tuner_it913x.o +obj-$(CONFIG_MEDIA_TUNER_IT913X) += it913x.o obj-$(CONFIG_MEDIA_TUNER_R820T) += r820t.o ccflags-y += -I$(srctree)/drivers/media/dvb-core diff --git a/drivers/media/tuners/tuner_it913x.c b/drivers/media/tuners/it913x.c similarity index 99% rename from drivers/media/tuners/tuner_it913x.c rename to drivers/media/tuners/it913x.c index b92d59979437..4627925ed117 100644 --- a/drivers/media/tuners/tuner_it913x.c +++ b/drivers/media/tuners/it913x.c @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.= */ -#include "tuner_it913x_priv.h" +#include "it913x_priv.h" struct it913x_state { struct i2c_adapter *i2c_adap; diff --git a/drivers/media/tuners/tuner_it913x.h b/drivers/media/tuners/it913x.h similarity index 100% rename from drivers/media/tuners/tuner_it913x.h rename to drivers/media/tuners/it913x.h diff --git a/drivers/media/tuners/tuner_it913x_priv.h b/drivers/media/tuners/it913x_priv.h similarity index 99% rename from drivers/media/tuners/tuner_it913x_priv.h rename to drivers/media/tuners/it913x_priv.h index cc6f4b1e45aa..781c98ecf5b6 100644 --- a/drivers/media/tuners/tuner_it913x_priv.h +++ b/drivers/media/tuners/it913x_priv.h @@ -23,7 +23,7 @@ #ifndef IT913X_PRIV_H #define IT913X_PRIV_H -#include "tuner_it913x.h" +#include "it913x.h" #include "af9033.h" #define PRO_LINK 0x0 diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h index c21902fdd4c4..70ec9c9aeb54 100644 --- a/drivers/media/usb/dvb-usb-v2/af9035.h +++ b/drivers/media/usb/dvb-usb-v2/af9035.h @@ -30,7 +30,7 @@ #include "mxl5007t.h" #include "tda18218.h" #include "fc2580.h" -#include "tuner_it913x.h" +#include "it913x.h" struct reg_val { u32 reg; -- 2.20.1