---

yaml --- r: 226212 b: refs/heads/master c: 32cf86f h: refs/heads/master v: v3
git-mirror · Dec 29, 2010 · f4c8154 · f4c8154
1 parent b36dd47
commit f4c8154
Show file tree

Hide file tree

Showing 114 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0
+refs/heads/master: 32cf86f6d16367db5a10039c1dd938a2427d697c
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -99,7 +99,7 @@ config VIDEO_MEDIA
 comment "Multimedia drivers"
 
 source "drivers/media/common/Kconfig"
-source "drivers/media/IR/Kconfig"
+source "drivers/media/rc/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/ IR/ video/
+obj-y += common/ rc/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/trunk/drivers/media/IR/Kconfig → trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/IR/Kconfig → trunk/drivers/media/rc/Kconfig
@@ -28,7 +28,7 @@ config LIRC
 	   LIRC daemon handles protocol decoding for IR reception and
 	   encoding for IR transmitting (aka "blasting").
 
-source "drivers/media/IR/keymaps/Kconfig"
+source "drivers/media/rc/keymaps/Kconfig"
 
 config IR_NEC_DECODER
 	tristate "Enable IR raw decoder for the NEC protocol"

diff --git a/trunk/drivers/media/IR/Makefile → trunk/drivers/media/rc/Makefile b/trunk/drivers/media/IR/Makefile → trunk/drivers/media/rc/Makefile
diff --git a/trunk/drivers/media/IR/ene_ir.c → trunk/drivers/media/rc/ene_ir.c b/trunk/drivers/media/IR/ene_ir.c → trunk/drivers/media/rc/ene_ir.c
diff --git a/trunk/drivers/media/IR/ene_ir.h → trunk/drivers/media/rc/ene_ir.h b/trunk/drivers/media/IR/ene_ir.h → trunk/drivers/media/rc/ene_ir.h
diff --git a/trunk/drivers/media/IR/imon.c → trunk/drivers/media/rc/imon.c b/trunk/drivers/media/IR/imon.c → trunk/drivers/media/rc/imon.c
diff --git a/trunk/drivers/media/IR/ir-core-priv.h → trunk/drivers/media/rc/ir-core-priv.h b/trunk/drivers/media/IR/ir-core-priv.h → trunk/drivers/media/rc/ir-core-priv.h
diff --git a/trunk/drivers/media/IR/ir-functions.c → trunk/drivers/media/rc/ir-functions.c b/trunk/drivers/media/IR/ir-functions.c → trunk/drivers/media/rc/ir-functions.c
diff --git a/trunk/drivers/media/IR/ir-jvc-decoder.c → trunk/drivers/media/rc/ir-jvc-decoder.c b/trunk/drivers/media/IR/ir-jvc-decoder.c → trunk/drivers/media/rc/ir-jvc-decoder.c
diff --git a/trunk/drivers/media/IR/ir-keytable.c → trunk/drivers/media/rc/ir-keytable.c b/trunk/drivers/media/IR/ir-keytable.c → trunk/drivers/media/rc/ir-keytable.c
diff --git a/trunk/drivers/media/IR/ir-lirc-codec.c → trunk/drivers/media/rc/ir-lirc-codec.c b/trunk/drivers/media/IR/ir-lirc-codec.c → trunk/drivers/media/rc/ir-lirc-codec.c
diff --git a/trunk/drivers/media/IR/ir-nec-decoder.c → trunk/drivers/media/rc/ir-nec-decoder.c b/trunk/drivers/media/IR/ir-nec-decoder.c → trunk/drivers/media/rc/ir-nec-decoder.c
diff --git a/trunk/drivers/media/IR/ir-raw-event.c → trunk/drivers/media/rc/ir-raw-event.c b/trunk/drivers/media/IR/ir-raw-event.c → trunk/drivers/media/rc/ir-raw-event.c
diff --git a/trunk/drivers/media/IR/ir-rc5-decoder.c → trunk/drivers/media/rc/ir-rc5-decoder.c b/trunk/drivers/media/IR/ir-rc5-decoder.c → trunk/drivers/media/rc/ir-rc5-decoder.c
diff --git a/trunk/drivers/media/IR/ir-rc5-sz-decoder.c → trunk/drivers/media/rc/ir-rc5-sz-decoder.c b/trunk/drivers/media/IR/ir-rc5-sz-decoder.c → trunk/drivers/media/rc/ir-rc5-sz-decoder.c
diff --git a/trunk/drivers/media/IR/ir-rc6-decoder.c → trunk/drivers/media/rc/ir-rc6-decoder.c b/trunk/drivers/media/IR/ir-rc6-decoder.c → trunk/drivers/media/rc/ir-rc6-decoder.c
diff --git a/trunk/drivers/media/IR/ir-sony-decoder.c → trunk/drivers/media/rc/ir-sony-decoder.c b/trunk/drivers/media/IR/ir-sony-decoder.c → trunk/drivers/media/rc/ir-sony-decoder.c
diff --git a/trunk/drivers/media/IR/ir-sysfs.c → trunk/drivers/media/rc/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c → trunk/drivers/media/rc/ir-sysfs.c
diff --git a/trunk/drivers/media/IR/keymaps/Kconfig → trunk/drivers/media/rc/keymaps/Kconfig b/trunk/drivers/media/IR/keymaps/Kconfig → trunk/drivers/media/rc/keymaps/Kconfig
diff --git a/trunk/drivers/media/IR/keymaps/Makefile → trunk/drivers/media/rc/keymaps/Makefile b/trunk/drivers/media/IR/keymaps/Makefile → trunk/drivers/media/rc/keymaps/Makefile
diff --git a/...s/media/IR/keymaps/rc-adstech-dvb-t-pci.c → ...s/media/rc/keymaps/rc-adstech-dvb-t-pci.c b/...s/media/IR/keymaps/rc-adstech-dvb-t-pci.c → ...s/media/rc/keymaps/rc-adstech-dvb-t-pci.c
diff --git a/...drivers/media/IR/keymaps/rc-alink-dtu-m.c → ...drivers/media/rc/keymaps/rc-alink-dtu-m.c b/...drivers/media/IR/keymaps/rc-alink-dtu-m.c → ...drivers/media/rc/keymaps/rc-alink-dtu-m.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-anysee.c → trunk/drivers/media/rc/keymaps/rc-anysee.c b/trunk/drivers/media/IR/keymaps/rc-anysee.c → trunk/drivers/media/rc/keymaps/rc-anysee.c
diff --git a/...ivers/media/IR/keymaps/rc-apac-viewcomp.c → ...ivers/media/rc/keymaps/rc-apac-viewcomp.c b/...ivers/media/IR/keymaps/rc-apac-viewcomp.c → ...ivers/media/rc/keymaps/rc-apac-viewcomp.c
diff --git a/...k/drivers/media/IR/keymaps/rc-asus-pc39.c → ...k/drivers/media/rc/keymaps/rc-asus-pc39.c b/...k/drivers/media/IR/keymaps/rc-asus-pc39.c → ...k/drivers/media/rc/keymaps/rc-asus-pc39.c
diff --git a/...edia/IR/keymaps/rc-ati-tv-wonder-hd-600.c → ...edia/rc/keymaps/rc-ati-tv-wonder-hd-600.c b/...edia/IR/keymaps/rc-ati-tv-wonder-hd-600.c → ...edia/rc/keymaps/rc-ati-tv-wonder-hd-600.c
diff --git a/...vers/media/IR/keymaps/rc-avermedia-a16d.c → ...vers/media/rc/keymaps/rc-avermedia-a16d.c b/...vers/media/IR/keymaps/rc-avermedia-a16d.c → ...vers/media/rc/keymaps/rc-avermedia-a16d.c
diff --git a/...s/media/IR/keymaps/rc-avermedia-cardbus.c → ...s/media/rc/keymaps/rc-avermedia-cardbus.c b/...s/media/IR/keymaps/rc-avermedia-cardbus.c → ...s/media/rc/keymaps/rc-avermedia-cardbus.c
diff --git a/...vers/media/IR/keymaps/rc-avermedia-dvbt.c → ...vers/media/rc/keymaps/rc-avermedia-dvbt.c b/...vers/media/IR/keymaps/rc-avermedia-dvbt.c → ...vers/media/rc/keymaps/rc-avermedia-dvbt.c
diff --git a/...ers/media/IR/keymaps/rc-avermedia-m135a.c → ...ers/media/rc/keymaps/rc-avermedia-m135a.c b/...ers/media/IR/keymaps/rc-avermedia-m135a.c → ...ers/media/rc/keymaps/rc-avermedia-m135a.c
diff --git a/...dia/IR/keymaps/rc-avermedia-m733a-rm-k6.c → ...dia/rc/keymaps/rc-avermedia-m733a-rm-k6.c b/...dia/IR/keymaps/rc-avermedia-m733a-rm-k6.c → ...dia/rc/keymaps/rc-avermedia-m733a-rm-k6.c
diff --git a/...ers/media/IR/keymaps/rc-avermedia-rm-ks.c → ...ers/media/rc/keymaps/rc-avermedia-rm-ks.c b/...ers/media/IR/keymaps/rc-avermedia-rm-ks.c → ...ers/media/rc/keymaps/rc-avermedia-rm-ks.c
diff --git a/...k/drivers/media/IR/keymaps/rc-avermedia.c → ...k/drivers/media/rc/keymaps/rc-avermedia.c b/...k/drivers/media/IR/keymaps/rc-avermedia.c → ...k/drivers/media/rc/keymaps/rc-avermedia.c
diff --git a/.../drivers/media/IR/keymaps/rc-avertv-303.c → .../drivers/media/rc/keymaps/rc-avertv-303.c b/.../drivers/media/IR/keymaps/rc-avertv-303.c → .../drivers/media/rc/keymaps/rc-avertv-303.c
diff --git a/.../media/IR/keymaps/rc-azurewave-ad-tu700.c → .../media/rc/keymaps/rc-azurewave-ad-tu700.c b/.../media/IR/keymaps/rc-azurewave-ad-tu700.c → .../media/rc/keymaps/rc-azurewave-ad-tu700.c
diff --git a/...ers/media/IR/keymaps/rc-behold-columbus.c → ...ers/media/rc/keymaps/rc-behold-columbus.c b/...ers/media/IR/keymaps/rc-behold-columbus.c → ...ers/media/rc/keymaps/rc-behold-columbus.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-behold.c → trunk/drivers/media/rc/keymaps/rc-behold.c b/trunk/drivers/media/IR/keymaps/rc-behold.c → trunk/drivers/media/rc/keymaps/rc-behold.c
diff --git a/...ivers/media/IR/keymaps/rc-budget-ci-old.c → ...ivers/media/rc/keymaps/rc-budget-ci-old.c b/...ivers/media/IR/keymaps/rc-budget-ci-old.c → ...ivers/media/rc/keymaps/rc-budget-ci-old.c
diff --git a/...rivers/media/IR/keymaps/rc-cinergy-1400.c → ...rivers/media/rc/keymaps/rc-cinergy-1400.c b/...rivers/media/IR/keymaps/rc-cinergy-1400.c → ...rivers/media/rc/keymaps/rc-cinergy-1400.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-cinergy.c → trunk/drivers/media/rc/keymaps/rc-cinergy.c b/trunk/drivers/media/IR/keymaps/rc-cinergy.c → trunk/drivers/media/rc/keymaps/rc-cinergy.c
diff --git a/...drivers/media/IR/keymaps/rc-dib0700-nec.c → ...drivers/media/rc/keymaps/rc-dib0700-nec.c b/...drivers/media/IR/keymaps/rc-dib0700-nec.c → ...drivers/media/rc/keymaps/rc-dib0700-nec.c
diff --git a/...drivers/media/IR/keymaps/rc-dib0700-rc5.c → ...drivers/media/rc/keymaps/rc-dib0700-rc5.c b/...drivers/media/IR/keymaps/rc-dib0700-rc5.c → ...drivers/media/rc/keymaps/rc-dib0700-rc5.c
diff --git a/...media/IR/keymaps/rc-digitalnow-tinytwin.c → ...media/rc/keymaps/rc-digitalnow-tinytwin.c b/...media/IR/keymaps/rc-digitalnow-tinytwin.c → ...media/rc/keymaps/rc-digitalnow-tinytwin.c
diff --git a/.../drivers/media/IR/keymaps/rc-digittrade.c → .../drivers/media/rc/keymaps/rc-digittrade.c b/.../drivers/media/IR/keymaps/rc-digittrade.c → .../drivers/media/rc/keymaps/rc-digittrade.c
diff --git a/.../drivers/media/IR/keymaps/rc-dm1105-nec.c → .../drivers/media/rc/keymaps/rc-dm1105-nec.c b/.../drivers/media/IR/keymaps/rc-dm1105-nec.c → .../drivers/media/rc/keymaps/rc-dm1105-nec.c
diff --git a/...ers/media/IR/keymaps/rc-dntv-live-dvb-t.c → ...ers/media/rc/keymaps/rc-dntv-live-dvb-t.c b/...ers/media/IR/keymaps/rc-dntv-live-dvb-t.c → ...ers/media/rc/keymaps/rc-dntv-live-dvb-t.c
diff --git a/.../media/IR/keymaps/rc-dntv-live-dvbt-pro.c → .../media/rc/keymaps/rc-dntv-live-dvbt-pro.c b/.../media/IR/keymaps/rc-dntv-live-dvbt-pro.c → .../media/rc/keymaps/rc-dntv-live-dvbt-pro.c
diff --git a/...drivers/media/IR/keymaps/rc-em-terratec.c → ...drivers/media/rc/keymaps/rc-em-terratec.c b/...drivers/media/IR/keymaps/rc-em-terratec.c → ...drivers/media/rc/keymaps/rc-em-terratec.c
diff --git a/...s/media/IR/keymaps/rc-encore-enltv-fm53.c → ...s/media/rc/keymaps/rc-encore-enltv-fm53.c b/...s/media/IR/keymaps/rc-encore-enltv-fm53.c → ...s/media/rc/keymaps/rc-encore-enltv-fm53.c
diff --git a/...rivers/media/IR/keymaps/rc-encore-enltv.c → ...rivers/media/rc/keymaps/rc-encore-enltv.c b/...rivers/media/IR/keymaps/rc-encore-enltv.c → ...rivers/media/rc/keymaps/rc-encore-enltv.c
diff --git a/...ivers/media/IR/keymaps/rc-encore-enltv2.c → ...ivers/media/rc/keymaps/rc-encore-enltv2.c b/...ivers/media/IR/keymaps/rc-encore-enltv2.c → ...ivers/media/rc/keymaps/rc-encore-enltv2.c
diff --git a/...rivers/media/IR/keymaps/rc-evga-indtube.c → ...rivers/media/rc/keymaps/rc-evga-indtube.c b/...rivers/media/IR/keymaps/rc-evga-indtube.c → ...rivers/media/rc/keymaps/rc-evga-indtube.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-eztv.c → trunk/drivers/media/rc/keymaps/rc-eztv.c b/trunk/drivers/media/IR/keymaps/rc-eztv.c → trunk/drivers/media/rc/keymaps/rc-eztv.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-flydvb.c → trunk/drivers/media/rc/keymaps/rc-flydvb.c b/trunk/drivers/media/IR/keymaps/rc-flydvb.c → trunk/drivers/media/rc/keymaps/rc-flydvb.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-flyvideo.c → trunk/drivers/media/rc/keymaps/rc-flyvideo.c b/trunk/drivers/media/IR/keymaps/rc-flyvideo.c → trunk/drivers/media/rc/keymaps/rc-flyvideo.c
diff --git a/...vers/media/IR/keymaps/rc-fusionhdtv-mce.c → ...vers/media/rc/keymaps/rc-fusionhdtv-mce.c b/...vers/media/IR/keymaps/rc-fusionhdtv-mce.c → ...vers/media/rc/keymaps/rc-fusionhdtv-mce.c
diff --git a/...ivers/media/IR/keymaps/rc-gadmei-rm008z.c → ...ivers/media/rc/keymaps/rc-gadmei-rm008z.c b/...ivers/media/IR/keymaps/rc-gadmei-rm008z.c → ...ivers/media/rc/keymaps/rc-gadmei-rm008z.c
diff --git a/.../media/IR/keymaps/rc-genius-tvgo-a11mce.c → .../media/rc/keymaps/rc-genius-tvgo-a11mce.c b/.../media/IR/keymaps/rc-genius-tvgo-a11mce.c → .../media/rc/keymaps/rc-genius-tvgo-a11mce.c
diff --git a/...drivers/media/IR/keymaps/rc-gotview7135.c → ...drivers/media/rc/keymaps/rc-gotview7135.c b/...drivers/media/IR/keymaps/rc-gotview7135.c → ...drivers/media/rc/keymaps/rc-gotview7135.c
diff --git a/...ivers/media/IR/keymaps/rc-hauppauge-new.c → ...ivers/media/rc/keymaps/rc-hauppauge-new.c b/...ivers/media/IR/keymaps/rc-hauppauge-new.c → ...ivers/media/rc/keymaps/rc-hauppauge-new.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-imon-mce.c → trunk/drivers/media/rc/keymaps/rc-imon-mce.c b/trunk/drivers/media/IR/keymaps/rc-imon-mce.c → trunk/drivers/media/rc/keymaps/rc-imon-mce.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-imon-pad.c → trunk/drivers/media/rc/keymaps/rc-imon-pad.c b/trunk/drivers/media/IR/keymaps/rc-imon-pad.c → trunk/drivers/media/rc/keymaps/rc-imon-pad.c
diff --git a/...ivers/media/IR/keymaps/rc-iodata-bctv7e.c → ...ivers/media/rc/keymaps/rc-iodata-bctv7e.c b/...ivers/media/IR/keymaps/rc-iodata-bctv7e.c → ...ivers/media/rc/keymaps/rc-iodata-bctv7e.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-kaiomy.c → trunk/drivers/media/rc/keymaps/rc-kaiomy.c b/trunk/drivers/media/IR/keymaps/rc-kaiomy.c → trunk/drivers/media/rc/keymaps/rc-kaiomy.c
diff --git a/...drivers/media/IR/keymaps/rc-kworld-315u.c → ...drivers/media/rc/keymaps/rc-kworld-315u.c b/...drivers/media/IR/keymaps/rc-kworld-315u.c → ...drivers/media/rc/keymaps/rc-kworld-315u.c
diff --git a/...dia/IR/keymaps/rc-kworld-plus-tv-analog.c → ...dia/rc/keymaps/rc-kworld-plus-tv-analog.c b/...dia/IR/keymaps/rc-kworld-plus-tv-analog.c → ...dia/rc/keymaps/rc-kworld-plus-tv-analog.c
diff --git a/...rs/media/IR/keymaps/rc-leadtek-y04g0051.c → ...rs/media/rc/keymaps/rc-leadtek-y04g0051.c b/...rs/media/IR/keymaps/rc-leadtek-y04g0051.c → ...rs/media/rc/keymaps/rc-leadtek-y04g0051.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-lirc.c → trunk/drivers/media/rc/keymaps/rc-lirc.c b/trunk/drivers/media/IR/keymaps/rc-lirc.c → trunk/drivers/media/rc/keymaps/rc-lirc.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-lme2510.c → trunk/drivers/media/rc/keymaps/rc-lme2510.c b/trunk/drivers/media/IR/keymaps/rc-lme2510.c → trunk/drivers/media/rc/keymaps/rc-lme2510.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-manli.c → trunk/drivers/media/rc/keymaps/rc-manli.c b/trunk/drivers/media/IR/keymaps/rc-manli.c → trunk/drivers/media/rc/keymaps/rc-manli.c
diff --git a/...vers/media/IR/keymaps/rc-msi-digivox-ii.c → ...vers/media/rc/keymaps/rc-msi-digivox-ii.c b/...vers/media/IR/keymaps/rc-msi-digivox-ii.c → ...vers/media/rc/keymaps/rc-msi-digivox-ii.c
diff --git a/...ers/media/IR/keymaps/rc-msi-digivox-iii.c → ...ers/media/rc/keymaps/rc-msi-digivox-iii.c b/...ers/media/IR/keymaps/rc-msi-digivox-iii.c → ...ers/media/rc/keymaps/rc-msi-digivox-iii.c
diff --git a/...media/IR/keymaps/rc-msi-tvanywhere-plus.c → ...media/rc/keymaps/rc-msi-tvanywhere-plus.c b/...media/IR/keymaps/rc-msi-tvanywhere-plus.c → ...media/rc/keymaps/rc-msi-tvanywhere-plus.c
diff --git a/...vers/media/IR/keymaps/rc-msi-tvanywhere.c → ...vers/media/rc/keymaps/rc-msi-tvanywhere.c b/...vers/media/IR/keymaps/rc-msi-tvanywhere.c → ...vers/media/rc/keymaps/rc-msi-tvanywhere.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-nebula.c → trunk/drivers/media/rc/keymaps/rc-nebula.c b/trunk/drivers/media/IR/keymaps/rc-nebula.c → trunk/drivers/media/rc/keymaps/rc-nebula.c
diff --git a/...a/IR/keymaps/rc-nec-terratec-cinergy-xs.c → ...a/rc/keymaps/rc-nec-terratec-cinergy-xs.c b/...a/IR/keymaps/rc-nec-terratec-cinergy-xs.c → ...a/rc/keymaps/rc-nec-terratec-cinergy-xs.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-norwood.c → trunk/drivers/media/rc/keymaps/rc-norwood.c b/trunk/drivers/media/IR/keymaps/rc-norwood.c → trunk/drivers/media/rc/keymaps/rc-norwood.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-npgtech.c → trunk/drivers/media/rc/keymaps/rc-npgtech.c b/trunk/drivers/media/IR/keymaps/rc-npgtech.c → trunk/drivers/media/rc/keymaps/rc-npgtech.c
diff --git a/.../drivers/media/IR/keymaps/rc-pctv-sedna.c → .../drivers/media/rc/keymaps/rc-pctv-sedna.c b/.../drivers/media/IR/keymaps/rc-pctv-sedna.c → .../drivers/media/rc/keymaps/rc-pctv-sedna.c
diff --git a/...vers/media/IR/keymaps/rc-pinnacle-color.c → ...vers/media/rc/keymaps/rc-pinnacle-color.c b/...vers/media/IR/keymaps/rc-pinnacle-color.c → ...vers/media/rc/keymaps/rc-pinnacle-color.c
diff --git a/...ivers/media/IR/keymaps/rc-pinnacle-grey.c → ...ivers/media/rc/keymaps/rc-pinnacle-grey.c b/...ivers/media/IR/keymaps/rc-pinnacle-grey.c → ...ivers/media/rc/keymaps/rc-pinnacle-grey.c
diff --git a/...rs/media/IR/keymaps/rc-pinnacle-pctv-hd.c → ...rs/media/rc/keymaps/rc-pinnacle-pctv-hd.c b/...rs/media/IR/keymaps/rc-pinnacle-pctv-hd.c → ...rs/media/rc/keymaps/rc-pinnacle-pctv-hd.c
diff --git a/...vers/media/IR/keymaps/rc-pixelview-mk12.c → ...vers/media/rc/keymaps/rc-pixelview-mk12.c b/...vers/media/IR/keymaps/rc-pixelview-mk12.c → ...vers/media/rc/keymaps/rc-pixelview-mk12.c
diff --git a/...ivers/media/IR/keymaps/rc-pixelview-new.c → ...ivers/media/rc/keymaps/rc-pixelview-new.c b/...ivers/media/IR/keymaps/rc-pixelview-new.c → ...ivers/media/rc/keymaps/rc-pixelview-new.c
diff --git a/...k/drivers/media/IR/keymaps/rc-pixelview.c → ...k/drivers/media/rc/keymaps/rc-pixelview.c b/...k/drivers/media/IR/keymaps/rc-pixelview.c → ...k/drivers/media/rc/keymaps/rc-pixelview.c
diff --git a/...dia/IR/keymaps/rc-powercolor-real-angel.c → ...dia/rc/keymaps/rc-powercolor-real-angel.c b/...dia/IR/keymaps/rc-powercolor-real-angel.c → ...dia/rc/keymaps/rc-powercolor-real-angel.c
diff --git a/...rivers/media/IR/keymaps/rc-proteus-2309.c → ...rivers/media/rc/keymaps/rc-proteus-2309.c b/...rivers/media/IR/keymaps/rc-proteus-2309.c → ...rivers/media/rc/keymaps/rc-proteus-2309.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-purpletv.c → trunk/drivers/media/rc/keymaps/rc-purpletv.c b/trunk/drivers/media/IR/keymaps/rc-purpletv.c → trunk/drivers/media/rc/keymaps/rc-purpletv.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-pv951.c → trunk/drivers/media/rc/keymaps/rc-pv951.c b/trunk/drivers/media/IR/keymaps/rc-pv951.c → trunk/drivers/media/rc/keymaps/rc-pv951.c
diff --git a/...s/media/IR/keymaps/rc-rc5-hauppauge-new.c → ...s/media/rc/keymaps/rc-rc5-hauppauge-new.c b/...s/media/IR/keymaps/rc-rc5-hauppauge-new.c → ...s/media/rc/keymaps/rc-rc5-hauppauge-new.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-rc5-tv.c → trunk/drivers/media/rc/keymaps/rc-rc5-tv.c b/trunk/drivers/media/IR/keymaps/rc-rc5-tv.c → trunk/drivers/media/rc/keymaps/rc-rc5-tv.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-rc6-mce.c → trunk/drivers/media/rc/keymaps/rc-rc6-mce.c b/trunk/drivers/media/IR/keymaps/rc-rc6-mce.c → trunk/drivers/media/rc/keymaps/rc-rc6-mce.c
diff --git a/...ia/IR/keymaps/rc-real-audio-220-32-keys.c → ...ia/rc/keymaps/rc-real-audio-220-32-keys.c b/...ia/IR/keymaps/rc-real-audio-220-32-keys.c → ...ia/rc/keymaps/rc-real-audio-220-32-keys.c
diff --git a/...k/drivers/media/IR/keymaps/rc-streamzap.c → ...k/drivers/media/rc/keymaps/rc-streamzap.c b/...k/drivers/media/IR/keymaps/rc-streamzap.c → ...k/drivers/media/rc/keymaps/rc-streamzap.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-tbs-nec.c → trunk/drivers/media/rc/keymaps/rc-tbs-nec.c b/trunk/drivers/media/IR/keymaps/rc-tbs-nec.c → trunk/drivers/media/rc/keymaps/rc-tbs-nec.c
diff --git a/...media/IR/keymaps/rc-terratec-cinergy-xs.c → ...media/rc/keymaps/rc-terratec-cinergy-xs.c b/...media/IR/keymaps/rc-terratec-cinergy-xs.c → ...media/rc/keymaps/rc-terratec-cinergy-xs.c
diff --git a/...ivers/media/IR/keymaps/rc-terratec-slim.c → ...ivers/media/rc/keymaps/rc-terratec-slim.c b/...ivers/media/IR/keymaps/rc-terratec-slim.c → ...ivers/media/rc/keymaps/rc-terratec-slim.c
diff --git a/...k/drivers/media/IR/keymaps/rc-tevii-nec.c → ...k/drivers/media/rc/keymaps/rc-tevii-nec.c b/...k/drivers/media/IR/keymaps/rc-tevii-nec.c → ...k/drivers/media/rc/keymaps/rc-tevii-nec.c
diff --git a/...media/IR/keymaps/rc-total-media-in-hand.c → ...media/rc/keymaps/rc-total-media-in-hand.c b/...media/IR/keymaps/rc-total-media-in-hand.c → ...media/rc/keymaps/rc-total-media-in-hand.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-trekstor.c → trunk/drivers/media/rc/keymaps/rc-trekstor.c b/trunk/drivers/media/IR/keymaps/rc-trekstor.c → trunk/drivers/media/rc/keymaps/rc-trekstor.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-tt-1500.c → trunk/drivers/media/rc/keymaps/rc-tt-1500.c b/trunk/drivers/media/IR/keymaps/rc-tt-1500.c → trunk/drivers/media/rc/keymaps/rc-tt-1500.c
diff --git a/...drivers/media/IR/keymaps/rc-twinhan1027.c → ...drivers/media/rc/keymaps/rc-twinhan1027.c b/...drivers/media/IR/keymaps/rc-twinhan1027.c → ...drivers/media/rc/keymaps/rc-twinhan1027.c
diff --git a/...vers/media/IR/keymaps/rc-videomate-s350.c → ...vers/media/rc/keymaps/rc-videomate-s350.c b/...vers/media/IR/keymaps/rc-videomate-s350.c → ...vers/media/rc/keymaps/rc-videomate-s350.c
diff --git a/...rs/media/IR/keymaps/rc-videomate-tv-pvr.c → ...rs/media/rc/keymaps/rc-videomate-tv-pvr.c b/...rs/media/IR/keymaps/rc-videomate-tv-pvr.c → ...rs/media/rc/keymaps/rc-videomate-tv-pvr.c
diff --git a/...edia/IR/keymaps/rc-winfast-usbii-deluxe.c → ...edia/rc/keymaps/rc-winfast-usbii-deluxe.c b/...edia/IR/keymaps/rc-winfast-usbii-deluxe.c → ...edia/rc/keymaps/rc-winfast-usbii-deluxe.c
diff --git a/trunk/drivers/media/IR/keymaps/rc-winfast.c → trunk/drivers/media/rc/keymaps/rc-winfast.c b/trunk/drivers/media/IR/keymaps/rc-winfast.c → trunk/drivers/media/rc/keymaps/rc-winfast.c
diff --git a/trunk/drivers/media/IR/lirc_dev.c → trunk/drivers/media/rc/lirc_dev.c b/trunk/drivers/media/IR/lirc_dev.c → trunk/drivers/media/rc/lirc_dev.c
diff --git a/trunk/drivers/media/IR/mceusb.c → trunk/drivers/media/rc/mceusb.c b/trunk/drivers/media/IR/mceusb.c → trunk/drivers/media/rc/mceusb.c
diff --git a/trunk/drivers/media/IR/nuvoton-cir.c → trunk/drivers/media/rc/nuvoton-cir.c b/trunk/drivers/media/IR/nuvoton-cir.c → trunk/drivers/media/rc/nuvoton-cir.c
diff --git a/trunk/drivers/media/IR/nuvoton-cir.h → trunk/drivers/media/rc/nuvoton-cir.h b/trunk/drivers/media/IR/nuvoton-cir.h → trunk/drivers/media/rc/nuvoton-cir.h
diff --git a/trunk/drivers/media/IR/rc-map.c → trunk/drivers/media/rc/rc-map.c b/trunk/drivers/media/IR/rc-map.c → trunk/drivers/media/rc/rc-map.c
diff --git a/trunk/drivers/media/IR/streamzap.c → trunk/drivers/media/rc/streamzap.c b/trunk/drivers/media/IR/streamzap.c → trunk/drivers/media/rc/streamzap.c