Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / drivers / media / rc / keymaps / Makefile

diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index cb72121..b57fc83 100644 (file)
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-gadmei-rm008z.o \
                        rc-genius-tvgo-a11mce.o \
                        rc-gotview7135.o \
-                       rc-hauppauge-new.o \
                        rc-imon-mce.o \
                        rc-imon-pad.o \
                        rc-iodata-bctv7e.o \
@@ -68,8 +67,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-proteus-2309.o \
                        rc-purpletv.o \
                        rc-pv951.o \
-                       rc-rc5-hauppauge-new.o \
-                       rc-rc5-tv.o \
+                       rc-hauppauge.o \
                        rc-rc6-mce.o \
                        rc-real-audio-220-32-keys.o \
                        rc-streamzap.o \
@@ -79,6 +77,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-terratec-slim.o \
                        rc-terratec-slim-2.o \
                        rc-tevii-nec.o \
+                       rc-tivo.o \
                        rc-total-media-in-hand.o \
                        rc-trekstor.o \
                        rc-tt-1500.o \