diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..5b4ac969a5865b46d2cffcdf041290a3b2210378
--- /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 0000000000000000000000000000000000000000..2781f430c6e1a2ef2b150cb9d6752470ec623687
--- /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
similarity index 100%
rename from drivers/media/common/ir-functions.c
rename to drivers/media/IR/ir-functions.c
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/IR/ir-keymaps.c
similarity index 100%
rename from drivers/media/common/ir-keymaps.c
rename to drivers/media/IR/ir-keymaps.c
diff --git a/drivers/media/common/ir-keytable.c b/drivers/media/IR/ir-keytable.c
similarity index 99%
rename from drivers/media/common/ir-keytable.c
rename to drivers/media/IR/ir-keytable.c
index ceef0e82fb4b649f14c618c431483a552606a4b8..99ed2deceef335a3808434b7168ec3e6730ed45d 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 ba69beeb0e21a850aab9d1a49b11c409b332f44e..a28541b2b1a219e5a2804f20201191f1ff98c953 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 09a829d8a7e71a4b7b0b5de035f7034d1748e82d..499b0810d01984f465b23ac1d490abcb30258156 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 169b337b7c9df6c16083995129ec7ce20683aa0c..e3ec9639321b750ab10d953899e843687adc0cc3 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 9dc74c93bf245e29657b16852ed59169bb3f6695..f63909d9c70bec2bebc0861444067f960a50d2e0 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