diff options
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/dvb | |
parent | a6e3b81f6198654207c4e972e7ed91931e53e93c (diff) |
[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>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dm1105/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/lmedm04.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_input.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/siano/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smsir.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig index 576f3b70d792..f3de0a4d63f2 100644 --- a/drivers/media/dvb/dm1105/Kconfig +++ b/drivers/media/dvb/dm1105/Kconfig | |||
@@ -8,7 +8,7 @@ config DVB_DM1105 | |||
8 | select DVB_CX24116 if !DVB_FE_CUSTOMISE | 8 | select DVB_CX24116 if !DVB_FE_CUSTOMISE |
9 | select DVB_SI21XX if !DVB_FE_CUSTOMISE | 9 | select DVB_SI21XX if !DVB_FE_CUSTOMISE |
10 | select DVB_DS3000 if !DVB_FE_CUSTOMISE | 10 | select DVB_DS3000 if !DVB_FE_CUSTOMISE |
11 | depends on IR_CORE | 11 | depends on RC_CORE |
12 | help | 12 | help |
13 | Support for cards based on the SDMC DM1105 PCI chip like | 13 | Support for cards based on the SDMC DM1105 PCI chip like |
14 | DvbWorld 2002 | 14 | DvbWorld 2002 |
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index d1a43858f29c..e9cacf6e9277 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <media/ir-core.h> | 30 | #include <media/rc-core.h> |
31 | 31 | ||
32 | #include "demux.h" | 32 | #include "demux.h" |
33 | #include "dmxdev.h" | 33 | #include "dmxdev.h" |
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 2525d3b3c88d..3d48ba019342 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DVB_USB | 1 | config DVB_USB |
2 | tristate "Support for various USB DVB devices" | 2 | tristate "Support for various USB DVB devices" |
3 | depends on DVB_CORE && USB && I2C && IR_CORE | 3 | depends on DVB_CORE && USB && I2C && RC_CORE |
4 | help | 4 | help |
5 | By enabling this you will be able to choose the various supported | 5 | By enabling this you will be able to choose the various supported |
6 | USB1.1 and USB2.0 DVB devices. | 6 | USB1.1 and USB2.0 DVB devices. |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 83aa9826560f..18828cb282c4 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
15 | #include <linux/firmware.h> | 15 | #include <linux/firmware.h> |
16 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
17 | #include <media/ir-core.h> | 17 | #include <media/rc-core.h> |
18 | 18 | ||
19 | #include "dvb_frontend.h" | 19 | #include "dvb_frontend.h" |
20 | #include "dvb_demux.h" | 20 | #include "dvb_demux.h" |
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c index d8f1b150e1cb..f0c030837f29 100644 --- a/drivers/media/dvb/dvb-usb/lmedm04.c +++ b/drivers/media/dvb/dvb-usb/lmedm04.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #define DVB_USB_LOG_PREFIX "LME2510(C)" | 61 | #define DVB_USB_LOG_PREFIX "LME2510(C)" |
62 | #include <linux/usb.h> | 62 | #include <linux/usb.h> |
63 | #include <linux/usb/input.h> | 63 | #include <linux/usb/input.h> |
64 | #include <media/ir-core.h> | 64 | #include <media/rc-core.h> |
65 | 65 | ||
66 | #include "dvb-usb.h" | 66 | #include "dvb-usb.h" |
67 | #include "lmedm04.h" | 67 | #include "lmedm04.h" |
diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig index fd0830ed10d8..a13a50503134 100644 --- a/drivers/media/dvb/mantis/Kconfig +++ b/drivers/media/dvb/mantis/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config MANTIS_CORE | 1 | config MANTIS_CORE |
2 | tristate "Mantis/Hopper PCI bridge based devices" | 2 | tristate "Mantis/Hopper PCI bridge based devices" |
3 | depends on PCI && I2C && INPUT && IR_CORE | 3 | depends on PCI && I2C && INPUT && RC_CORE |
4 | 4 | ||
5 | help | 5 | help |
6 | Support for PCI cards based on the Mantis and Hopper PCi bridge. | 6 | Support for PCI cards based on the Mantis and Hopper PCi bridge. |
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c index 209f2110e20c..e030b18ad6d9 100644 --- a/drivers/media/dvb/mantis/mantis_input.c +++ b/drivers/media/dvb/mantis/mantis_input.c | |||
@@ -18,7 +18,7 @@ | |||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <media/ir-core.h> | 21 | #include <media/rc-core.h> |
22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
23 | 23 | ||
24 | #include "dmxdev.h" | 24 | #include "dmxdev.h" |
diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig index e520bceee0af..bc6456eb2c4f 100644 --- a/drivers/media/dvb/siano/Kconfig +++ b/drivers/media/dvb/siano/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | config SMS_SIANO_MDTV | 5 | config SMS_SIANO_MDTV |
6 | tristate "Siano SMS1xxx based MDTV receiver" | 6 | tristate "Siano SMS1xxx based MDTV receiver" |
7 | depends on DVB_CORE && IR_CORE && HAS_DMA | 7 | depends on DVB_CORE && RC_CORE && HAS_DMA |
8 | ---help--- | 8 | ---help--- |
9 | Choose Y or M here if you have MDTV receiver with a Siano chipset. | 9 | Choose Y or M here if you have MDTV receiver with a Siano chipset. |
10 | 10 | ||
diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/dvb/siano/smsir.h index c2f68a460ee1..ae92b3a8587e 100644 --- a/drivers/media/dvb/siano/smsir.h +++ b/drivers/media/dvb/siano/smsir.h | |||
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
28 | #define __SMS_IR_H__ | 28 | #define __SMS_IR_H__ |
29 | 29 | ||
30 | #include <linux/input.h> | 30 | #include <linux/input.h> |
31 | #include <media/ir-core.h> | 31 | #include <media/rc-core.h> |
32 | 32 | ||
33 | #define IR_DEFAULT_TIMEOUT 100 | 33 | #define IR_DEFAULT_TIMEOUT 100 |
34 | 34 | ||
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index 0ffd6943da83..44afab2fdc2d 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
@@ -97,7 +97,7 @@ config DVB_BUDGET_CI | |||
97 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE | 97 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE |
98 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE | 98 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE |
99 | select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE | 99 | select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE |
100 | depends on IR_CORE | 100 | depends on RC_CORE |
101 | help | 101 | help |
102 | Support for simple SAA7146 based DVB cards | 102 | Support for simple SAA7146 based DVB cards |
103 | (so called Budget- or Nova-PCI cards) without onboard | 103 | (so called Budget- or Nova-PCI cards) without onboard |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 9aca0f37993b..32caa9b7af8e 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
37 | #include <media/ir-core.h> | 37 | #include <media/rc-core.h> |
38 | 38 | ||
39 | #include "budget.h" | 39 | #include "budget.h" |
40 | 40 | ||