---

yaml --- r: 176824 b: refs/heads/master c: e27d381 h: refs/heads/master v: v3
git-mirror · Dec 16, 2009 · 14f07d6 · 14f07d6
1 parent 4347cf2
commit 14f07d6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909d15a70d6a269ba599c539c55a574482355ff1
+refs/heads/master: e27d38112eb727df189a9ebf560aa104cb102253
diff --git a/trunk/drivers/media/IR/Kconfig b/trunk/drivers/media/IR/Kconfig
@@ -0,0 +1,4 @@
+config VIDEO_IR
+	tristate
+	depends on INPUT
+	default INPUT
diff --git a/trunk/drivers/media/IR/Makefile b/trunk/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/trunk/drivers/media/common/ir-functions.c → trunk/drivers/media/IR/ir-functions.c b/trunk/drivers/media/common/ir-functions.c → trunk/drivers/media/IR/ir-functions.c
diff --git a/trunk/drivers/media/common/ir-keymaps.c → trunk/drivers/media/IR/ir-keymaps.c b/trunk/drivers/media/common/ir-keymaps.c → trunk/drivers/media/IR/ir-keymaps.c
diff --git a/trunk/drivers/media/common/ir-keytable.c → trunk/drivers/media/IR/ir-keytable.c b/trunk/drivers/media/common/ir-keytable.c → trunk/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/trunk/drivers/media/Kconfig b/trunk/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/trunk/drivers/media/Makefile b/trunk/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/trunk/drivers/media/common/Makefile b/trunk/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/trunk/drivers/media/video/Kconfig b/trunk/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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o

		obj-$(CONFIG_VIDEO_IR) += ir-common.o