diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile
index f136a6d831208fe18c43fe0d8c8aef065475ed6d..2ebe4b725b5145993cc5a3c3509d45e6cdd01385 100644
--- a/drivers/media/tuners/Makefile
+++ b/drivers/media/tuners/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_MEDIA_TUNER_TUA9001) += tua9001.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) += it913x.o
+obj-$(CONFIG_MEDIA_TUNER_IT913X) += tuner_it913x.o
 
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/tuner_it913x.c
similarity index 99%
rename from drivers/media/tuners/it913x.c
rename to drivers/media/tuners/tuner_it913x.c
index 4d7a2476105033dd61eb31643f7f54b775ac8acd..6f30d7e535b8e0b6d0ce2ea28e508c6334bae221 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/tuner_it913x.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
  */
 
-#include "it913x_priv.h"
+#include "tuner_it913x_priv.h"
 
 struct it913x_state {
 	struct i2c_adapter *i2c_adap;
diff --git a/drivers/media/tuners/it913x.h b/drivers/media/tuners/tuner_it913x.h
similarity index 100%
rename from drivers/media/tuners/it913x.h
rename to drivers/media/tuners/tuner_it913x.h
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/tuner_it913x_priv.h
similarity index 98%
rename from drivers/media/tuners/it913x_priv.h
rename to drivers/media/tuners/tuner_it913x_priv.h
index 00dcf3c27888d2d93fad3a853887ca0082096341..ce652108aa5dc9c555361d3fd807296af38277c9 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/tuner_it913x_priv.h
@@ -23,7 +23,7 @@
 #ifndef IT913X_PRIV_H
 #define IT913X_PRIV_H
 
-#include "it913x.h"
+#include "tuner_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 0f42b6cb37088fc83fa2df4d9ba297e9bb6dded2..b5827ca3a01ea811b2a7d47531ec420d16a292f9 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 "it913x.h"
+#include "tuner_it913x.h"
 
 struct reg_val {
 	u32 reg;