---

yaml --- r: 367066 b: refs/heads/master c: 99ca555 h: refs/heads/master v: v3
git-mirror · Apr 16, 2013 · 712aeea · 712aeea
1 parent 8092cc3
commit 712aeea
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76dea4cf52784474ca6adc4a2addf55e128b3634
+refs/heads/master: 99ca5557fff4a4d1d87874384354d42f6c395e1a
diff --git a/trunk/drivers/media/tuners/Makefile b/trunk/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/trunk/drivers/media/tuners/it913x.c → trunk/drivers/media/tuners/tuner_it913x.c b/trunk/drivers/media/tuners/it913x.c → trunk/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/trunk/drivers/media/tuners/it913x.h → trunk/drivers/media/tuners/tuner_it913x.h b/trunk/drivers/media/tuners/it913x.h → trunk/drivers/media/tuners/tuner_it913x.h
diff --git a/trunk/drivers/media/tuners/it913x_priv.h → .../drivers/media/tuners/tuner_it913x_priv.h b/trunk/drivers/media/tuners/it913x_priv.h → .../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/trunk/drivers/media/usb/dvb-usb-v2/af9035.h b/trunk/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;