[media] rc: rename the remaining things to rc_core

The Remote Controller subsystem is meant to be used not only by Infra Red but also for similar types of Remote Controllers. The core is not specific to Infra Red. As such, rename: - ir-core.h to rc-core.h - IR_CORE to RC_CORE - namespace inside rc-core.c/rc-core.h To be consistent with the other changes. No functional change on this patch. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
author: Mauro Carvalho Chehab <mchehab@redhat.com> 2010-11-17 11:28:38 -0500
committer: Mauro Carvalho Chehab <mchehab@redhat.com> 2010-12-29 05:16:50 -0500
commit: 6bda96447cef24fbf97a798b1ea664224d5fdc25 (patch)
tree: 4ab424732b58dfc3b2d0f1b64bd625d67f857cfa /drivers/media/video
parent: a6e3b81f6198654207c4e972e7ed91931e53e93c (diff)
20 files changed, 21 insertions, 21 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 963b3e6c4a97..4b751ef47a83 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -96,7 +96,7 @@ config VIDEO_HELPER_CHIPS_AUTO
 config VIDEO_IR_I2C
        tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
-        depends on I2C && IR_CORE
+        depends on I2C && RC_CORE
        default y
        ---help---
          Most boards have an IR chip directly connected via GPIO. However,
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 3c7c0a572c45..7da5c2e1fc12 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_BT848
        select I2C_ALGOBIT
        select VIDEO_BTCX
        select VIDEOBUF_DMA_SG
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 0bbdd481e336..b71d04d12085 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -41,7 +41,7 @@
 #include <linux/device.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/tveeprom.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 #include "bt848.h"
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index f3c3ccb491fe..d9d2f6ad6ffb 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -2,7 +2,7 @@ config VIDEO_CX18
        tristate "Conexant cx23418 MPEG encoder support"
        depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
        select I2C_ALGOBIT
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_CX2341X
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
index d6a235007a7d..ae85a7a7bd73 100644
--- a/drivers/media/video/cx231xx/Kconfig
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_CX231XX
        depends on VIDEO_DEV && I2C
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEOBUF_VMALLOC
        select VIDEO_CX25840
        select VIDEO_CX2341X
@@ -16,7 +16,7 @@ config VIDEO_CX231XX
 config VIDEO_CX231XX_RC
        bool "Conexant cx231xx Remote Controller additional support"
-        depends on IR_CORE
+        depends on RC_CORE
        depends on VIDEO_CX231XX
        default y
        ---help---
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index fcccc9d2a08e..87a20ae6fcc0 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -34,7 +34,7 @@
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-device.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/videobuf-dvb.h>
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index e1367b35647a..6b4a516addfe 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -5,7 +5,7 @@ config VIDEO_CX23885
        select VIDEO_BTCX
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEOBUF_DVB
        select VIDEOBUF_DMA_SG
        select VIDEO_CX25840
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index f1bb3a8683c1..e824ba63fdde 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -36,7 +36,7 @@
 */
 #include <linux/slab.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/v4l2-subdev.h>
 #include "cx23885.h"
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index f350d88944e8..fd387229daff 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -30,7 +30,7 @@
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/videobuf-dvb.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include "btcx-risc.h"
 #include "cx23885-reg.h"
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c
index e78e3e4c8112..e37be6fcf67d 100644
--- a/drivers/media/video/cx23885/cx23888-ir.c
+++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -26,7 +26,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include "cx23885.h"
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c
index 97a4e9b25fe4..627926f6bde8 100644
--- a/drivers/media/video/cx25840/cx25840-ir.c
+++ b/drivers/media/video/cx25840/cx25840-ir.c
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/kfifo.h>
 #include <media/cx25840.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include "cx25840-core.h"
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index dbae62935e1f..5c42abdf422f 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_CX88
        tristate "Conexant 2388x (bt878 successor) support"
-        depends on VIDEO_DEV && PCI && I2C && IR_CORE
+        depends on VIDEO_DEV && PCI && I2C && RC_CORE
        select I2C_ALGOBIT
        select VIDEO_BTCX
        select VIDEOBUF_DMA_SG
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 3b2ef45d6348..a73033846fce 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include "cx88.h"
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #define MODULE_NAME "cx88xx"
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 72ea2baba790..985100ea17a4 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_EM28XX
        depends on VIDEO_DEV && I2C
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEOBUF_VMALLOC
        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 6a48043a7b92..6f2795a3d4b7 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -33,7 +33,7 @@
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-device.h>
 #include <media/ir-kbd-i2c.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
 #include <media/videobuf-dvb.h>
 #endif
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index de0060fa33f1..83662a4ff73c 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -46,7 +46,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index c4f19801c73b..89f65914cc8e 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -2,7 +2,7 @@ config VIDEO_IVTV
        tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
        depends on VIDEO_V4L2 && PCI && I2C
        select I2C_ALGOBIT
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_CX2341X
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index e03bff9e4246..380f1b28cfcc 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -26,7 +26,7 @@ config VIDEO_SAA7134_ALSA
 config VIDEO_SAA7134_RC
        bool "Philips SAA7134 Remote Controller support"
-        depends on IR_CORE
+        depends on RC_CORE
        depends on VIDEO_SAA7134
        default y
        ---help---
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index c6ef95ec68f2..1923f3ca0eab 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -37,7 +37,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/tuner.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/videobuf-dma-sg.h>
 #include <sound/core.h>
diff --git a/drivers/media/video/tlg2300/Kconfig b/drivers/media/video/tlg2300/Kconfig
index 580580ec9362..645d915267e6 100644
--- a/drivers/media/video/tlg2300/Kconfig
+++ b/drivers/media/video/tlg2300/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_TLG2300
        depends on VIDEO_DEV && I2C && SND && DVB_CORE
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
-        depends on IR_CORE
+        depends on RC_CORE
        select VIDEOBUF_VMALLOC
        select SND_PCM
        select VIDEOBUF_DVB
author	Mauro Carvalho Chehab <mchehab@redhat.com>	2010-11-17 11:28:38 -0500
committer	Mauro Carvalho Chehab <mchehab@redhat.com>	2010-12-29 05:16:50 -0500
commit	6bda96447cef24fbf97a798b1ea664224d5fdc25 (patch)
tree	4ab424732b58dfc3b2d0f1b64bd625d67f857cfa /drivers/media/video
parent	a6e3b81f6198654207c4e972e7ed91931e53e93c (diff)

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 963b3e6c4a97..4b751ef47a83 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig
@@ -96,7 +96,7 @@ config VIDEO_HELPER_CHIPS_AUTO
96		96
97	config VIDEO_IR_I2C	97	config VIDEO_IR_I2C
98	tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO	98	tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
99	depends on I2C && IR_CORE	99	depends on I2C && RC_CORE
100	default y	100	default y
101	---help---	101	---help---
102	Most boards have an IR chip directly connected via GPIO. However,	102	Most boards have an IR chip directly connected via GPIO. However,


diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig index 3c7c0a572c45..7da5c2e1fc12 100644 --- a/drivers/media/video/bt8xx/Kconfig +++ b/drivers/media/video/bt8xx/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_BT848
4	select I2C_ALGOBIT	4	select I2C_ALGOBIT
5	select VIDEO_BTCX	5	select VIDEO_BTCX
6	select VIDEOBUF_DMA_SG	6	select VIDEOBUF_DMA_SG
7	depends on IR_CORE	7	depends on RC_CORE
8	select VIDEO_TUNER	8	select VIDEO_TUNER
9	select VIDEO_TVEEPROM	9	select VIDEO_TVEEPROM
10	select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO	10	select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO


diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 0bbdd481e336..b71d04d12085 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h
@@ -41,7 +41,7 @@
41	#include <linux/device.h>	41	#include <linux/device.h>
42	#include <media/videobuf-dma-sg.h>	42	#include <media/videobuf-dma-sg.h>
43	#include <media/tveeprom.h>	43	#include <media/tveeprom.h>
44	#include <media/ir-core.h>	44	#include <media/rc-core.h>
45	#include <media/ir-kbd-i2c.h>	45	#include <media/ir-kbd-i2c.h>
46		46
47	#include "bt848.h"	47	#include "bt848.h"


diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index f3c3ccb491fe..d9d2f6ad6ffb 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig
@@ -2,7 +2,7 @@ config VIDEO_CX18
2	tristate "Conexant cx23418 MPEG encoder support"	2	tristate "Conexant cx23418 MPEG encoder support"
3	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL	3	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
4	select I2C_ALGOBIT	4	select I2C_ALGOBIT
5	depends on IR_CORE	5	depends on RC_CORE
6	select VIDEO_TUNER	6	select VIDEO_TUNER
7	select VIDEO_TVEEPROM	7	select VIDEO_TVEEPROM
8	select VIDEO_CX2341X	8	select VIDEO_CX2341X


diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig index d6a235007a7d..ae85a7a7bd73 100644 --- a/drivers/media/video/cx231xx/Kconfig +++ b/drivers/media/video/cx231xx/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_CX231XX
3	depends on VIDEO_DEV && I2C	3	depends on VIDEO_DEV && I2C
4	select VIDEO_TUNER	4	select VIDEO_TUNER
5	select VIDEO_TVEEPROM	5	select VIDEO_TVEEPROM
6	depends on IR_CORE	6	depends on RC_CORE
7	select VIDEOBUF_VMALLOC	7	select VIDEOBUF_VMALLOC
8	select VIDEO_CX25840	8	select VIDEO_CX25840
9	select VIDEO_CX2341X	9	select VIDEO_CX2341X
@@ -16,7 +16,7 @@ config VIDEO_CX231XX
16		16
17	config VIDEO_CX231XX_RC	17	config VIDEO_CX231XX_RC
18	bool "Conexant cx231xx Remote Controller additional support"	18	bool "Conexant cx231xx Remote Controller additional support"
19	depends on IR_CORE	19	depends on RC_CORE
20	depends on VIDEO_CX231XX	20	depends on VIDEO_CX231XX
21	default y	21	default y
22	---help---	22	---help---


diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index fcccc9d2a08e..87a20ae6fcc0 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -34,7 +34,7 @@
34		34
35	#include <media/videobuf-vmalloc.h>	35	#include <media/videobuf-vmalloc.h>
36	#include <media/v4l2-device.h>	36	#include <media/v4l2-device.h>
37	#include <media/ir-core.h>	37	#include <media/rc-core.h>
38	#include <media/ir-kbd-i2c.h>	38	#include <media/ir-kbd-i2c.h>
39	#include <media/videobuf-dvb.h>	39	#include <media/videobuf-dvb.h>
40		40


diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index e1367b35647a..6b4a516addfe 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig
@@ -5,7 +5,7 @@ config VIDEO_CX23885
5	select VIDEO_BTCX	5	select VIDEO_BTCX
6	select VIDEO_TUNER	6	select VIDEO_TUNER
7	select VIDEO_TVEEPROM	7	select VIDEO_TVEEPROM
8	depends on IR_CORE	8	depends on RC_CORE
9	select VIDEOBUF_DVB	9	select VIDEOBUF_DVB
10	select VIDEOBUF_DMA_SG	10	select VIDEOBUF_DMA_SG
11	select VIDEO_CX25840	11	select VIDEO_CX25840


diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c index f1bb3a8683c1..e824ba63fdde 100644 --- a/drivers/media/video/cx23885/cx23885-input.c +++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -36,7 +36,7 @@
36	*/	36	*/
37		37
38	#include <linux/slab.h>	38	#include <linux/slab.h>
39	#include <media/ir-core.h>	39	#include <media/rc-core.h>
40	#include <media/v4l2-subdev.h>	40	#include <media/v4l2-subdev.h>
41		41
42	#include "cx23885.h"	42	#include "cx23885.h"


diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index f350d88944e8..fd387229daff 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h
@@ -30,7 +30,7 @@
30	#include <media/tveeprom.h>	30	#include <media/tveeprom.h>
31	#include <media/videobuf-dma-sg.h>	31	#include <media/videobuf-dma-sg.h>
32	#include <media/videobuf-dvb.h>	32	#include <media/videobuf-dvb.h>
33	#include <media/ir-core.h>	33	#include <media/rc-core.h>
34		34
35	#include "btcx-risc.h"	35	#include "btcx-risc.h"
36	#include "cx23885-reg.h"	36	#include "cx23885-reg.h"


diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c index e78e3e4c8112..e37be6fcf67d 100644 --- a/drivers/media/video/cx23885/cx23888-ir.c +++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -26,7 +26,7 @@
26		26
27	#include <media/v4l2-device.h>	27	#include <media/v4l2-device.h>
28	#include <media/v4l2-chip-ident.h>	28	#include <media/v4l2-chip-ident.h>
29	#include <media/ir-core.h>	29	#include <media/rc-core.h>
30		30
31	#include "cx23885.h"	31	#include "cx23885.h"
32		32


diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c index 97a4e9b25fe4..627926f6bde8 100644 --- a/drivers/media/video/cx25840/cx25840-ir.c +++ b/drivers/media/video/cx25840/cx25840-ir.c
@@ -24,7 +24,7 @@
24	#include <linux/slab.h>	24	#include <linux/slab.h>
25	#include <linux/kfifo.h>	25	#include <linux/kfifo.h>
26	#include <media/cx25840.h>	26	#include <media/cx25840.h>
27	#include <media/ir-core.h>	27	#include <media/rc-core.h>
28		28
29	#include "cx25840-core.h"	29	#include "cx25840-core.h"
30		30


diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index dbae62935e1f..5c42abdf422f 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig
@@ -1,6 +1,6 @@
1	config VIDEO_CX88	1	config VIDEO_CX88
2	tristate "Conexant 2388x (bt878 successor) support"	2	tristate "Conexant 2388x (bt878 successor) support"
3	depends on VIDEO_DEV && PCI && I2C && IR_CORE	3	depends on VIDEO_DEV && PCI && I2C && RC_CORE
4	select I2C_ALGOBIT	4	select I2C_ALGOBIT
5	select VIDEO_BTCX	5	select VIDEO_BTCX
6	select VIDEOBUF_DMA_SG	6	select VIDEOBUF_DMA_SG


diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 3b2ef45d6348..a73033846fce 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c
@@ -29,7 +29,7 @@
29	#include <linux/module.h>	29	#include <linux/module.h>
30		30
31	#include "cx88.h"	31	#include "cx88.h"
32	#include <media/ir-core.h>	32	#include <media/rc-core.h>
33		33
34	#define MODULE_NAME "cx88xx"	34	#define MODULE_NAME "cx88xx"
35		35


diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig index 72ea2baba790..985100ea17a4 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/video/em28xx/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_EM28XX
3	depends on VIDEO_DEV && I2C	3	depends on VIDEO_DEV && I2C
4	select VIDEO_TUNER	4	select VIDEO_TUNER
5	select VIDEO_TVEEPROM	5	select VIDEO_TVEEPROM
6	depends on IR_CORE	6	depends on RC_CORE
7	select VIDEOBUF_VMALLOC	7	select VIDEOBUF_VMALLOC
8	select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO	8	select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
9	select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO	9	select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO


diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 6a48043a7b92..6f2795a3d4b7 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h
@@ -33,7 +33,7 @@
33	#include <media/videobuf-vmalloc.h>	33	#include <media/videobuf-vmalloc.h>
34	#include <media/v4l2-device.h>	34	#include <media/v4l2-device.h>
35	#include <media/ir-kbd-i2c.h>	35	#include <media/ir-kbd-i2c.h>
36	#include <media/ir-core.h>	36	#include <media/rc-core.h>
37	#if defined(CONFIG_VIDEO_EM28XX_DVB) \|\| defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)	37	#if defined(CONFIG_VIDEO_EM28XX_DVB) \|\| defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
38	#include <media/videobuf-dvb.h>	38	#include <media/videobuf-dvb.h>
39	#endif	39	#endif


diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index de0060fa33f1..83662a4ff73c 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c
@@ -46,7 +46,7 @@
46	#include <linux/i2c.h>	46	#include <linux/i2c.h>
47	#include <linux/workqueue.h>	47	#include <linux/workqueue.h>
48		48
49	#include <media/ir-core.h>	49	#include <media/rc-core.h>
50	#include <media/ir-kbd-i2c.h>	50	#include <media/ir-kbd-i2c.h>
51		51
52	/* ----------------------------------------------------------------------- */	52	/* ----------------------------------------------------------------------- */


diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig index c4f19801c73b..89f65914cc8e 100644 --- a/drivers/media/video/ivtv/Kconfig +++ b/drivers/media/video/ivtv/Kconfig
@@ -2,7 +2,7 @@ config VIDEO_IVTV
2	tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"	2	tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
3	depends on VIDEO_V4L2 && PCI && I2C	3	depends on VIDEO_V4L2 && PCI && I2C
4	select I2C_ALGOBIT	4	select I2C_ALGOBIT
5	depends on IR_CORE	5	depends on RC_CORE
6	select VIDEO_TUNER	6	select VIDEO_TUNER
7	select VIDEO_TVEEPROM	7	select VIDEO_TVEEPROM
8	select VIDEO_CX2341X	8	select VIDEO_CX2341X


diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index e03bff9e4246..380f1b28cfcc 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig
@@ -26,7 +26,7 @@ config VIDEO_SAA7134_ALSA
26		26
27	config VIDEO_SAA7134_RC	27	config VIDEO_SAA7134_RC
28	bool "Philips SAA7134 Remote Controller support"	28	bool "Philips SAA7134 Remote Controller support"
29	depends on IR_CORE	29	depends on RC_CORE
30	depends on VIDEO_SAA7134	30	depends on VIDEO_SAA7134
31	default y	31	default y
32	---help---	32	---help---


diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index c6ef95ec68f2..1923f3ca0eab 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h
@@ -37,7 +37,7 @@
37	#include <media/v4l2-ioctl.h>	37	#include <media/v4l2-ioctl.h>
38	#include <media/v4l2-device.h>	38	#include <media/v4l2-device.h>
39	#include <media/tuner.h>	39	#include <media/tuner.h>
40	#include <media/ir-core.h>	40	#include <media/rc-core.h>
41	#include <media/ir-kbd-i2c.h>	41	#include <media/ir-kbd-i2c.h>
42	#include <media/videobuf-dma-sg.h>	42	#include <media/videobuf-dma-sg.h>
43	#include <sound/core.h>	43	#include <sound/core.h>


diff --git a/drivers/media/video/tlg2300/Kconfig b/drivers/media/video/tlg2300/Kconfig index 580580ec9362..645d915267e6 100644 --- a/drivers/media/video/tlg2300/Kconfig +++ b/drivers/media/video/tlg2300/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_TLG2300
3	depends on VIDEO_DEV && I2C && SND && DVB_CORE	3	depends on VIDEO_DEV && I2C && SND && DVB_CORE
4	select VIDEO_TUNER	4	select VIDEO_TUNER
5	select VIDEO_TVEEPROM	5	select VIDEO_TVEEPROM
6	depends on IR_CORE	6	depends on RC_CORE
7	select VIDEOBUF_VMALLOC	7	select VIDEOBUF_VMALLOC
8	select SND_PCM	8	select SND_PCM
9	select VIDEOBUF_DVB	9	select VIDEOBUF_DVB