Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / keymaps / Makefile

diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
similarity index 97%
rename from drivers/media/IR/keymaps/Makefile
rename to drivers/media/rc/keymaps/Makefile
index 3194d391bbd49749e0cba015784242ee014a4c08..0659e9f501445a97925c56b7c518f4a61b1e501c 100644 (file)
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-pinnacle-pctv-hd.o \
                        rc-pixelview.o \
                        rc-pixelview-mk12.o \
+                       rc-pixelview-002t.o \
                        rc-pixelview-new.o \
                        rc-powercolor-real-angel.o \
                        rc-proteus-2309.o \
@@ -80,6 +81,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-trekstor.o \
                        rc-tt-1500.o \
                        rc-twinhan1027.o \
+                       rc-videomate-m1f.o \
                        rc-videomate-s350.o \
                        rc-videomate-tv-pvr.o \
                        rc-winfast.o \