diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-11 12:00:00 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-16 03:18:42 +0100 |
| commit | e27d38112eb727df189a9ebf560aa104cb102253 (patch) | |
| tree | 454d8cff41ebe8027ecd74d809ed415e427782b3 | |
| parent | V4L/DVB (13611): radio-tea5764: Correct size given to memset (diff) | |
| download | linux-e27d38112eb727df189a9ebf560aa104cb102253.tar.xz linux-e27d38112eb727df189a9ebf560aa104cb102253.zip | |
V4L/DVB (13612): IR: Move common IR code to drivers/media/IR
This is the first step of creating a common code for IR that can be
used by other input devices.
For now, keep IR dir at drivers/media, to easy the movement of the IR files,
but later patches may move it to drivers/IR or drivers/input/IR.
No functional changes is done on this patch.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/IR/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/media/IR/Makefile | 3 | ||||
| -rw-r--r-- | drivers/media/IR/ir-functions.c (renamed from drivers/media/common/ir-functions.c) | 0 | ||||
| -rw-r--r-- | drivers/media/IR/ir-keymaps.c (renamed from drivers/media/common/ir-keymaps.c) | 0 | ||||
| -rw-r--r-- | drivers/media/IR/ir-keytable.c (renamed from drivers/media/common/ir-keytable.c) | 1 | ||||
| -rw-r--r-- | drivers/media/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/common/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/video/Kconfig | 4 |
9 files changed, 10 insertions, 7 deletions
diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig new file mode 100644 index 000000000000..5b4ac969a586 --- /dev/null +++ b/drivers/media/IR/Kconfig @@ -0,0 +1,4 @@ +config VIDEO_IR + tristate + depends on INPUT + default INPUT diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile new file mode 100644 index 000000000000..2781f430c6e1 --- /dev/null +++ b/drivers/media/IR/Makefile @@ -0,0 +1,3 @@ +ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o + +obj-$(CONFIG_VIDEO_IR) += ir-common.o diff --git a/drivers/media/common/ir-functions.c b/drivers/media/IR/ir-functions.c index e616f624ceaa..e616f624ceaa 100644 --- a/drivers/media/common/ir-functions.c +++ b/drivers/media/IR/ir-functions.c diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/IR/ir-keymaps.c index 9bbe6b1e9871..9bbe6b1e9871 100644 --- a/drivers/media/common/ir-keymaps.c +++ b/drivers/media/IR/ir-keymaps.c diff --git a/drivers/media/common/ir-keytable.c b/drivers/media/IR/ir-keytable.c index ceef0e82fb4b..99ed2deceef3 100644 --- a/drivers/media/common/ir-keytable.c +++ b/drivers/media/IR/ir-keytable.c @@ -10,6 +10,7 @@ #define IR_TAB_MIN_SIZE 32 #define IR_TAB_MAX_SIZE 1024 + /** * ir_seek_table() - returns the element order on the table * @rc_tab: the ir_scancode_table with the keymap to be used diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index ba69beeb0e21..a28541b2b1a2 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -99,6 +99,7 @@ config VIDEO_MEDIA comment "Multimedia drivers" source "drivers/media/common/Kconfig" +source "drivers/media/IR/Kconfig" # # Tuner drivers for DVB and V4L diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 09a829d8a7e7..499b0810d019 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -2,7 +2,7 @@ # Makefile for the kernel multimedia device drivers. # -obj-y += common/ video/ +obj-y += common/ IR/ video/ obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_DVB_CORE) += dvb/ diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 169b337b7c9d..e3ec9639321b 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1,8 +1,6 @@ saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o -ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o obj-y += tuners/ obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o -obj-$(CONFIG_VIDEO_IR) += ir-common.o diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 9dc74c93bf24..f63909d9c70b 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -37,10 +37,6 @@ config VIDEO_BTCX depends on PCI tristate -config VIDEO_IR - tristate - depends on INPUT - config VIDEO_TVEEPROM tristate depends on I2C |