Commit e27d3811 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 909d15a7
config VIDEO_IR
tristate
depends on INPUT
default INPUT
ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define IR_TAB_MIN_SIZE 32 #define IR_TAB_MIN_SIZE 32
#define IR_TAB_MAX_SIZE 1024 #define IR_TAB_MAX_SIZE 1024
/** /**
* ir_seek_table() - returns the element order on the table * ir_seek_table() - returns the element order on the table
* @rc_tab: the ir_scancode_table with the keymap to be used * @rc_tab: the ir_scancode_table with the keymap to be used
......
...@@ -99,6 +99,7 @@ config VIDEO_MEDIA ...@@ -99,6 +99,7 @@ config VIDEO_MEDIA
comment "Multimedia drivers" comment "Multimedia drivers"
source "drivers/media/common/Kconfig" source "drivers/media/common/Kconfig"
source "drivers/media/IR/Kconfig"
# #
# Tuner drivers for DVB and V4L # Tuner drivers for DVB and V4L
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the kernel multimedia device drivers. # Makefile for the kernel multimedia device drivers.
# #
obj-y += common/ video/ obj-y += common/ IR/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/ obj-$(CONFIG_DVB_CORE) += dvb/
saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.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-y += tuners/
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o
...@@ -37,10 +37,6 @@ config VIDEO_BTCX ...@@ -37,10 +37,6 @@ config VIDEO_BTCX
depends on PCI depends on PCI
tristate tristate
config VIDEO_IR
tristate
depends on INPUT
config VIDEO_TVEEPROM config VIDEO_TVEEPROM
tristate tristate
depends on I2C depends on I2C
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment