diff options
| -rw-r--r-- | drivers/media/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/rc/Kconfig (renamed from drivers/media/IR/Kconfig) | 2 | ||||
| -rw-r--r-- | drivers/media/rc/Makefile (renamed from drivers/media/IR/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ene_ir.c (renamed from drivers/media/IR/ene_ir.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ene_ir.h (renamed from drivers/media/IR/ene_ir.h) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/imon.c (renamed from drivers/media/IR/imon.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-core-priv.h (renamed from drivers/media/IR/ir-core-priv.h) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-functions.c (renamed from drivers/media/IR/ir-functions.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-jvc-decoder.c (renamed from drivers/media/IR/ir-jvc-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-keytable.c (renamed from drivers/media/IR/ir-keytable.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-lirc-codec.c (renamed from drivers/media/IR/ir-lirc-codec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-nec-decoder.c (renamed from drivers/media/IR/ir-nec-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-raw-event.c (renamed from drivers/media/IR/ir-raw-event.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-rc5-decoder.c (renamed from drivers/media/IR/ir-rc5-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-rc5-sz-decoder.c (renamed from drivers/media/IR/ir-rc5-sz-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-rc6-decoder.c (renamed from drivers/media/IR/ir-rc6-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-sony-decoder.c (renamed from drivers/media/IR/ir-sony-decoder.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/ir-sysfs.c (renamed from drivers/media/IR/ir-sysfs.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/Kconfig (renamed from drivers/media/IR/keymaps/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/Makefile (renamed from drivers/media/IR/keymaps/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c (renamed from drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-alink-dtu-m.c (renamed from drivers/media/IR/keymaps/rc-alink-dtu-m.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-anysee.c (renamed from drivers/media/IR/keymaps/rc-anysee.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-apac-viewcomp.c (renamed from drivers/media/IR/keymaps/rc-apac-viewcomp.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-asus-pc39.c (renamed from drivers/media/IR/keymaps/rc-asus-pc39.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c (renamed from drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-a16d.c (renamed from drivers/media/IR/keymaps/rc-avermedia-a16d.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-cardbus.c (renamed from drivers/media/IR/keymaps/rc-avermedia-cardbus.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-dvbt.c (renamed from drivers/media/IR/keymaps/rc-avermedia-dvbt.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-m135a.c (renamed from drivers/media/IR/keymaps/rc-avermedia-m135a.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c (renamed from drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia-rm-ks.c (renamed from drivers/media/IR/keymaps/rc-avermedia-rm-ks.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avermedia.c (renamed from drivers/media/IR/keymaps/rc-avermedia.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-avertv-303.c (renamed from drivers/media/IR/keymaps/rc-avertv-303.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c (renamed from drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-behold-columbus.c (renamed from drivers/media/IR/keymaps/rc-behold-columbus.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-behold.c (renamed from drivers/media/IR/keymaps/rc-behold.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-budget-ci-old.c (renamed from drivers/media/IR/keymaps/rc-budget-ci-old.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-cinergy-1400.c (renamed from drivers/media/IR/keymaps/rc-cinergy-1400.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-cinergy.c (renamed from drivers/media/IR/keymaps/rc-cinergy.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dib0700-nec.c (renamed from drivers/media/IR/keymaps/rc-dib0700-nec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dib0700-rc5.c (renamed from drivers/media/IR/keymaps/rc-dib0700-rc5.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c (renamed from drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-digittrade.c (renamed from drivers/media/IR/keymaps/rc-digittrade.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dm1105-nec.c (renamed from drivers/media/IR/keymaps/rc-dm1105-nec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c (renamed from drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c (renamed from drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-em-terratec.c (renamed from drivers/media/IR/keymaps/rc-em-terratec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-encore-enltv-fm53.c (renamed from drivers/media/IR/keymaps/rc-encore-enltv-fm53.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-encore-enltv.c (renamed from drivers/media/IR/keymaps/rc-encore-enltv.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-encore-enltv2.c (renamed from drivers/media/IR/keymaps/rc-encore-enltv2.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-evga-indtube.c (renamed from drivers/media/IR/keymaps/rc-evga-indtube.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-eztv.c (renamed from drivers/media/IR/keymaps/rc-eztv.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-flydvb.c (renamed from drivers/media/IR/keymaps/rc-flydvb.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-flyvideo.c (renamed from drivers/media/IR/keymaps/rc-flyvideo.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-fusionhdtv-mce.c (renamed from drivers/media/IR/keymaps/rc-fusionhdtv-mce.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-gadmei-rm008z.c (renamed from drivers/media/IR/keymaps/rc-gadmei-rm008z.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c (renamed from drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-gotview7135.c (renamed from drivers/media/IR/keymaps/rc-gotview7135.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-hauppauge-new.c (renamed from drivers/media/IR/keymaps/rc-hauppauge-new.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-imon-mce.c (renamed from drivers/media/IR/keymaps/rc-imon-mce.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-imon-pad.c (renamed from drivers/media/IR/keymaps/rc-imon-pad.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-iodata-bctv7e.c (renamed from drivers/media/IR/keymaps/rc-iodata-bctv7e.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-kaiomy.c (renamed from drivers/media/IR/keymaps/rc-kaiomy.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-kworld-315u.c (renamed from drivers/media/IR/keymaps/rc-kworld-315u.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c (renamed from drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-leadtek-y04g0051.c (renamed from drivers/media/IR/keymaps/rc-leadtek-y04g0051.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-lirc.c (renamed from drivers/media/IR/keymaps/rc-lirc.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-lme2510.c (renamed from drivers/media/IR/keymaps/rc-lme2510.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-manli.c (renamed from drivers/media/IR/keymaps/rc-manli.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-msi-digivox-ii.c (renamed from drivers/media/IR/keymaps/rc-msi-digivox-ii.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-msi-digivox-iii.c (renamed from drivers/media/IR/keymaps/rc-msi-digivox-iii.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c (renamed from drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-msi-tvanywhere.c (renamed from drivers/media/IR/keymaps/rc-msi-tvanywhere.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-nebula.c (renamed from drivers/media/IR/keymaps/rc-nebula.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c (renamed from drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-norwood.c (renamed from drivers/media/IR/keymaps/rc-norwood.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-npgtech.c (renamed from drivers/media/IR/keymaps/rc-npgtech.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pctv-sedna.c (renamed from drivers/media/IR/keymaps/rc-pctv-sedna.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pinnacle-color.c (renamed from drivers/media/IR/keymaps/rc-pinnacle-color.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pinnacle-grey.c (renamed from drivers/media/IR/keymaps/rc-pinnacle-grey.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c (renamed from drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview-mk12.c (renamed from drivers/media/IR/keymaps/rc-pixelview-mk12.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview-new.c (renamed from drivers/media/IR/keymaps/rc-pixelview-new.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview.c (renamed from drivers/media/IR/keymaps/rc-pixelview.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-powercolor-real-angel.c (renamed from drivers/media/IR/keymaps/rc-powercolor-real-angel.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-proteus-2309.c (renamed from drivers/media/IR/keymaps/rc-proteus-2309.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-purpletv.c (renamed from drivers/media/IR/keymaps/rc-purpletv.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pv951.c (renamed from drivers/media/IR/keymaps/rc-pv951.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c (renamed from drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-rc5-tv.c (renamed from drivers/media/IR/keymaps/rc-rc5-tv.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-rc6-mce.c (renamed from drivers/media/IR/keymaps/rc-rc6-mce.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c (renamed from drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-streamzap.c (renamed from drivers/media/IR/keymaps/rc-streamzap.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-tbs-nec.c (renamed from drivers/media/IR/keymaps/rc-tbs-nec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c (renamed from drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-terratec-slim.c (renamed from drivers/media/IR/keymaps/rc-terratec-slim.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-tevii-nec.c (renamed from drivers/media/IR/keymaps/rc-tevii-nec.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-total-media-in-hand.c (renamed from drivers/media/IR/keymaps/rc-total-media-in-hand.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-trekstor.c (renamed from drivers/media/IR/keymaps/rc-trekstor.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-tt-1500.c (renamed from drivers/media/IR/keymaps/rc-tt-1500.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-twinhan1027.c (renamed from drivers/media/IR/keymaps/rc-twinhan1027.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-videomate-s350.c (renamed from drivers/media/IR/keymaps/rc-videomate-s350.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-videomate-tv-pvr.c (renamed from drivers/media/IR/keymaps/rc-videomate-tv-pvr.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c (renamed from drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-winfast.c (renamed from drivers/media/IR/keymaps/rc-winfast.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/lirc_dev.c (renamed from drivers/media/IR/lirc_dev.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/mceusb.c (renamed from drivers/media/IR/mceusb.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.c (renamed from drivers/media/IR/nuvoton-cir.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.h (renamed from drivers/media/IR/nuvoton-cir.h) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/rc-map.c (renamed from drivers/media/IR/rc-map.c) | 0 | ||||
| -rw-r--r-- | drivers/media/rc/streamzap.c (renamed from drivers/media/IR/streamzap.c) | 0 |
113 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index a28541b2b1a..c21dfc28482 100644 --- a/drivers/media/Kconfig +++ b/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/drivers/media/Makefile b/drivers/media/Makefile index 499b0810d01..b603ea645ed 100644 --- a/drivers/media/Makefile +++ b/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/drivers/media/IR/Kconfig b/drivers/media/rc/Kconfig index 20e02a0a5e4..d05003d0995 100644 --- a/drivers/media/IR/Kconfig +++ b/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/drivers/media/IR/Makefile b/drivers/media/rc/Makefile index 38873cff342..38873cff342 100644 --- a/drivers/media/IR/Makefile +++ b/drivers/media/rc/Makefile diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/rc/ene_ir.c index 7637babcd26..7637babcd26 100644 --- a/drivers/media/IR/ene_ir.c +++ b/drivers/media/rc/ene_ir.c diff --git a/drivers/media/IR/ene_ir.h b/drivers/media/rc/ene_ir.h index f5870667a43..f5870667a43 100644 --- a/drivers/media/IR/ene_ir.h +++ b/drivers/media/rc/ene_ir.h diff --git a/drivers/media/IR/imon.c b/drivers/media/rc/imon.c index 79f4f58c2ea..79f4f58c2ea 100644 --- a/drivers/media/IR/imon.c +++ b/drivers/media/rc/imon.c diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/rc/ir-core-priv.h index 81c936bd793..81c936bd793 100644 --- a/drivers/media/IR/ir-core-priv.h +++ b/drivers/media/rc/ir-core-priv.h diff --git a/drivers/media/IR/ir-functions.c b/drivers/media/rc/ir-functions.c index ec021c92527..ec021c92527 100644 --- a/drivers/media/IR/ir-functions.c +++ b/drivers/media/rc/ir-functions.c diff --git a/drivers/media/IR/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c index 63dca6e5458..63dca6e5458 100644 --- a/drivers/media/IR/ir-jvc-decoder.c +++ b/drivers/media/rc/ir-jvc-decoder.c diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/rc/ir-keytable.c index 8039110350d..8039110350d 100644 --- a/drivers/media/IR/ir-keytable.c +++ b/drivers/media/rc/ir-keytable.c diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index 9fc0db9d344..9fc0db9d344 100644 --- a/drivers/media/IR/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c index 70993f79c8a..70993f79c8a 100644 --- a/drivers/media/IR/ir-nec-decoder.c +++ b/drivers/media/rc/ir-nec-decoder.c diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/rc/ir-raw-event.c index a06a07e4e0b..a06a07e4e0b 100644 --- a/drivers/media/IR/ir-raw-event.c +++ b/drivers/media/rc/ir-raw-event.c diff --git a/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c index 572ed4ca8c6..572ed4ca8c6 100644 --- a/drivers/media/IR/ir-rc5-decoder.c +++ b/drivers/media/rc/ir-rc5-decoder.c diff --git a/drivers/media/IR/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c index 7c413501a3f..7c413501a3f 100644 --- a/drivers/media/IR/ir-rc5-sz-decoder.c +++ b/drivers/media/rc/ir-rc5-sz-decoder.c diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c index d25da91f44f..d25da91f44f 100644 --- a/drivers/media/IR/ir-rc6-decoder.c +++ b/drivers/media/rc/ir-rc6-decoder.c diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c index 2d15730822b..2d15730822b 100644 --- a/drivers/media/IR/ir-sony-decoder.c +++ b/drivers/media/rc/ir-sony-decoder.c diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/rc/ir-sysfs.c index 38423a8da87..38423a8da87 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/rc/ir-sysfs.c diff --git a/drivers/media/IR/keymaps/Kconfig b/drivers/media/rc/keymaps/Kconfig index 14b22f58f82..14b22f58f82 100644 --- a/drivers/media/IR/keymaps/Kconfig +++ b/drivers/media/rc/keymaps/Kconfig diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile index 3194d391bbd..3194d391bbd 100644 --- a/drivers/media/IR/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile diff --git a/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c index b17283176ec..b17283176ec 100644 --- a/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c +++ b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c diff --git a/drivers/media/IR/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c index ddfee7f8093..ddfee7f8093 100644 --- a/drivers/media/IR/keymaps/rc-alink-dtu-m.c +++ b/drivers/media/rc/keymaps/rc-alink-dtu-m.c diff --git a/drivers/media/IR/keymaps/rc-anysee.c b/drivers/media/rc/keymaps/rc-anysee.c index 30d70498cfe..30d70498cfe 100644 --- a/drivers/media/IR/keymaps/rc-anysee.c +++ b/drivers/media/rc/keymaps/rc-anysee.c diff --git a/drivers/media/IR/keymaps/rc-apac-viewcomp.c b/drivers/media/rc/keymaps/rc-apac-viewcomp.c index 0ef2b562baf..0ef2b562baf 100644 --- a/drivers/media/IR/keymaps/rc-apac-viewcomp.c +++ b/drivers/media/rc/keymaps/rc-apac-viewcomp.c diff --git a/drivers/media/IR/keymaps/rc-asus-pc39.c b/drivers/media/rc/keymaps/rc-asus-pc39.c index 2996e0a3b8d..2996e0a3b8d 100644 --- a/drivers/media/IR/keymaps/rc-asus-pc39.c +++ b/drivers/media/rc/keymaps/rc-asus-pc39.c diff --git a/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c index 8edfd293d01..8edfd293d01 100644 --- a/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c +++ b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-a16d.c b/drivers/media/rc/keymaps/rc-avermedia-a16d.c index 12f043587f2..12f043587f2 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-a16d.c +++ b/drivers/media/rc/keymaps/rc-avermedia-a16d.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c index 2a945b02e8c..2a945b02e8c 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-cardbus.c +++ b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-dvbt.c b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c index 39dde622287..39dde622287 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-dvbt.c +++ b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a.c b/drivers/media/rc/keymaps/rc-avermedia-m135a.c index e4471fb2ad1..e4471fb2ad1 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-m135a.c +++ b/drivers/media/rc/keymaps/rc-avermedia-m135a.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c index cf8d45717cb..cf8d45717cb 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c +++ b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c diff --git a/drivers/media/IR/keymaps/rc-avermedia-rm-ks.c b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c index 9ee60906c86..9ee60906c86 100644 --- a/drivers/media/IR/keymaps/rc-avermedia-rm-ks.c +++ b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c diff --git a/drivers/media/IR/keymaps/rc-avermedia.c b/drivers/media/rc/keymaps/rc-avermedia.c index 21effd5bfb0..21effd5bfb0 100644 --- a/drivers/media/IR/keymaps/rc-avermedia.c +++ b/drivers/media/rc/keymaps/rc-avermedia.c diff --git a/drivers/media/IR/keymaps/rc-avertv-303.c b/drivers/media/rc/keymaps/rc-avertv-303.c index 971c59d6f9d..971c59d6f9d 100644 --- a/drivers/media/IR/keymaps/rc-avertv-303.c +++ b/drivers/media/rc/keymaps/rc-avertv-303.c diff --git a/drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c index e0876147d47..e0876147d47 100644 --- a/drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c +++ b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c diff --git a/drivers/media/IR/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c index 9f56c98fef5..9f56c98fef5 100644 --- a/drivers/media/IR/keymaps/rc-behold-columbus.c +++ b/drivers/media/rc/keymaps/rc-behold-columbus.c diff --git a/drivers/media/IR/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c index abc140b2098..abc140b2098 100644 --- a/drivers/media/IR/keymaps/rc-behold.c +++ b/drivers/media/rc/keymaps/rc-behold.c diff --git a/drivers/media/IR/keymaps/rc-budget-ci-old.c b/drivers/media/rc/keymaps/rc-budget-ci-old.c index 64c2ac91333..64c2ac91333 100644 --- a/drivers/media/IR/keymaps/rc-budget-ci-old.c +++ b/drivers/media/rc/keymaps/rc-budget-ci-old.c diff --git a/drivers/media/IR/keymaps/rc-cinergy-1400.c b/drivers/media/rc/keymaps/rc-cinergy-1400.c index 074f2c2c2c6..074f2c2c2c6 100644 --- a/drivers/media/IR/keymaps/rc-cinergy-1400.c +++ b/drivers/media/rc/keymaps/rc-cinergy-1400.c diff --git a/drivers/media/IR/keymaps/rc-cinergy.c b/drivers/media/rc/keymaps/rc-cinergy.c index cf84c3dba74..cf84c3dba74 100644 --- a/drivers/media/IR/keymaps/rc-cinergy.c +++ b/drivers/media/rc/keymaps/rc-cinergy.c diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c index ae1832038fb..ae1832038fb 100644 --- a/drivers/media/IR/keymaps/rc-dib0700-nec.c +++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c index 4a4797cfd77..4a4797cfd77 100644 --- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c +++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c diff --git a/drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c index 63e469e2dd2..63e469e2dd2 100644 --- a/drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c +++ b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c diff --git a/drivers/media/IR/keymaps/rc-digittrade.c b/drivers/media/rc/keymaps/rc-digittrade.c index 5dece78e19c..5dece78e19c 100644 --- a/drivers/media/IR/keymaps/rc-digittrade.c +++ b/drivers/media/rc/keymaps/rc-digittrade.c diff --git a/drivers/media/IR/keymaps/rc-dm1105-nec.c b/drivers/media/rc/keymaps/rc-dm1105-nec.c index 90684d0efea..90684d0efea 100644 --- a/drivers/media/IR/keymaps/rc-dm1105-nec.c +++ b/drivers/media/rc/keymaps/rc-dm1105-nec.c diff --git a/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c index 8a4027af964..8a4027af964 100644 --- a/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c +++ b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c diff --git a/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c index 6f4d60764d5..6f4d60764d5 100644 --- a/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c +++ b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c diff --git a/drivers/media/IR/keymaps/rc-em-terratec.c b/drivers/media/rc/keymaps/rc-em-terratec.c index 3130c9c29e6..3130c9c29e6 100644 --- a/drivers/media/IR/keymaps/rc-em-terratec.c +++ b/drivers/media/rc/keymaps/rc-em-terratec.c diff --git a/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c index 4b816967877..4b816967877 100644 --- a/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c diff --git a/drivers/media/IR/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c index 9fabffd28cc..9fabffd28cc 100644 --- a/drivers/media/IR/keymaps/rc-encore-enltv.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv.c diff --git a/drivers/media/IR/keymaps/rc-encore-enltv2.c b/drivers/media/rc/keymaps/rc-encore-enltv2.c index efefd516661..efefd516661 100644 --- a/drivers/media/IR/keymaps/rc-encore-enltv2.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv2.c diff --git a/drivers/media/IR/keymaps/rc-evga-indtube.c b/drivers/media/rc/keymaps/rc-evga-indtube.c index 3f3fb13813b..3f3fb13813b 100644 --- a/drivers/media/IR/keymaps/rc-evga-indtube.c +++ b/drivers/media/rc/keymaps/rc-evga-indtube.c diff --git a/drivers/media/IR/keymaps/rc-eztv.c b/drivers/media/rc/keymaps/rc-eztv.c index 660907a78db..660907a78db 100644 --- a/drivers/media/IR/keymaps/rc-eztv.c +++ b/drivers/media/rc/keymaps/rc-eztv.c diff --git a/drivers/media/IR/keymaps/rc-flydvb.c b/drivers/media/rc/keymaps/rc-flydvb.c index a173c81035f..a173c81035f 100644 --- a/drivers/media/IR/keymaps/rc-flydvb.c +++ b/drivers/media/rc/keymaps/rc-flydvb.c diff --git a/drivers/media/IR/keymaps/rc-flyvideo.c b/drivers/media/rc/keymaps/rc-flyvideo.c index 9c73043cbdb..9c73043cbdb 100644 --- a/drivers/media/IR/keymaps/rc-flyvideo.c +++ b/drivers/media/rc/keymaps/rc-flyvideo.c diff --git a/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c index cdb10389b10..cdb10389b10 100644 --- a/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c +++ b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c diff --git a/drivers/media/IR/keymaps/rc-gadmei-rm008z.c b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c index c16c0d1263a..c16c0d1263a 100644 --- a/drivers/media/IR/keymaps/rc-gadmei-rm008z.c +++ b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c diff --git a/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c index 89f8e384e52..89f8e384e52 100644 --- a/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c +++ b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c diff --git a/drivers/media/IR/keymaps/rc-gotview7135.c b/drivers/media/rc/keymaps/rc-gotview7135.c index 52f025bb35f..52f025bb35f 100644 --- a/drivers/media/IR/keymaps/rc-gotview7135.c +++ b/drivers/media/rc/keymaps/rc-gotview7135.c diff --git a/drivers/media/IR/keymaps/rc-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge-new.c index c6f8cd7c518..c6f8cd7c518 100644 --- a/drivers/media/IR/keymaps/rc-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-hauppauge-new.c diff --git a/drivers/media/IR/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c index e49f350e3a0..e49f350e3a0 100644 --- a/drivers/media/IR/keymaps/rc-imon-mce.c +++ b/drivers/media/rc/keymaps/rc-imon-mce.c diff --git a/drivers/media/IR/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c index bc4db72f02e..bc4db72f02e 100644 --- a/drivers/media/IR/keymaps/rc-imon-pad.c +++ b/drivers/media/rc/keymaps/rc-imon-pad.c diff --git a/drivers/media/IR/keymaps/rc-iodata-bctv7e.c b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c index ef6600259fc..ef6600259fc 100644 --- a/drivers/media/IR/keymaps/rc-iodata-bctv7e.c +++ b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c diff --git a/drivers/media/IR/keymaps/rc-kaiomy.c b/drivers/media/rc/keymaps/rc-kaiomy.c index 4c7883ba0f1..4c7883ba0f1 100644 --- a/drivers/media/IR/keymaps/rc-kaiomy.c +++ b/drivers/media/rc/keymaps/rc-kaiomy.c diff --git a/drivers/media/IR/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c index 618c817374e..618c817374e 100644 --- a/drivers/media/IR/keymaps/rc-kworld-315u.c +++ b/drivers/media/rc/keymaps/rc-kworld-315u.c diff --git a/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c index 366732f1f7b..366732f1f7b 100644 --- a/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c +++ b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c diff --git a/drivers/media/IR/keymaps/rc-leadtek-y04g0051.c b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c index 7521315fd87..7521315fd87 100644 --- a/drivers/media/IR/keymaps/rc-leadtek-y04g0051.c +++ b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c diff --git a/drivers/media/IR/keymaps/rc-lirc.c b/drivers/media/rc/keymaps/rc-lirc.c index 43fcf903508..43fcf903508 100644 --- a/drivers/media/IR/keymaps/rc-lirc.c +++ b/drivers/media/rc/keymaps/rc-lirc.c diff --git a/drivers/media/IR/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c index 40dcf0b4e21..40dcf0b4e21 100644 --- a/drivers/media/IR/keymaps/rc-lme2510.c +++ b/drivers/media/rc/keymaps/rc-lme2510.c diff --git a/drivers/media/IR/keymaps/rc-manli.c b/drivers/media/rc/keymaps/rc-manli.c index 0f590b3d01c..0f590b3d01c 100644 --- a/drivers/media/IR/keymaps/rc-manli.c +++ b/drivers/media/rc/keymaps/rc-manli.c diff --git a/drivers/media/IR/keymaps/rc-msi-digivox-ii.c b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c index 67237fbf9e4..67237fbf9e4 100644 --- a/drivers/media/IR/keymaps/rc-msi-digivox-ii.c +++ b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c diff --git a/drivers/media/IR/keymaps/rc-msi-digivox-iii.c b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c index 882056e52ef..882056e52ef 100644 --- a/drivers/media/IR/keymaps/rc-msi-digivox-iii.c +++ b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c diff --git a/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c index eb8e42c18ff..eb8e42c18ff 100644 --- a/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c diff --git a/drivers/media/IR/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c index ef411854f06..ef411854f06 100644 --- a/drivers/media/IR/keymaps/rc-msi-tvanywhere.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c diff --git a/drivers/media/IR/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c index ccc50eb402e..ccc50eb402e 100644 --- a/drivers/media/IR/keymaps/rc-nebula.c +++ b/drivers/media/rc/keymaps/rc-nebula.c diff --git a/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c index e1b54d20db6..e1b54d20db6 100644 --- a/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c +++ b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c diff --git a/drivers/media/IR/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c index e5849a6b3f0..e5849a6b3f0 100644 --- a/drivers/media/IR/keymaps/rc-norwood.c +++ b/drivers/media/rc/keymaps/rc-norwood.c diff --git a/drivers/media/IR/keymaps/rc-npgtech.c b/drivers/media/rc/keymaps/rc-npgtech.c index b9ece1e9029..b9ece1e9029 100644 --- a/drivers/media/IR/keymaps/rc-npgtech.c +++ b/drivers/media/rc/keymaps/rc-npgtech.c diff --git a/drivers/media/IR/keymaps/rc-pctv-sedna.c b/drivers/media/rc/keymaps/rc-pctv-sedna.c index 4129bb44a25..4129bb44a25 100644 --- a/drivers/media/IR/keymaps/rc-pctv-sedna.c +++ b/drivers/media/rc/keymaps/rc-pctv-sedna.c diff --git a/drivers/media/IR/keymaps/rc-pinnacle-color.c b/drivers/media/rc/keymaps/rc-pinnacle-color.c index 326e023ce12..326e023ce12 100644 --- a/drivers/media/IR/keymaps/rc-pinnacle-color.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-color.c diff --git a/drivers/media/IR/keymaps/rc-pinnacle-grey.c b/drivers/media/rc/keymaps/rc-pinnacle-grey.c index 14cb772515c..14cb772515c 100644 --- a/drivers/media/IR/keymaps/rc-pinnacle-grey.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-grey.c diff --git a/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c index 835bf4ef8de..835bf4ef8de 100644 --- a/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c diff --git a/drivers/media/IR/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c index 5a735d569a8..5a735d569a8 100644 --- a/drivers/media/IR/keymaps/rc-pixelview-mk12.c +++ b/drivers/media/rc/keymaps/rc-pixelview-mk12.c diff --git a/drivers/media/IR/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c index 7bbbbf5735e..7bbbbf5735e 100644 --- a/drivers/media/IR/keymaps/rc-pixelview-new.c +++ b/drivers/media/rc/keymaps/rc-pixelview-new.c diff --git a/drivers/media/IR/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c index 82ff12e182a..82ff12e182a 100644 --- a/drivers/media/IR/keymaps/rc-pixelview.c +++ b/drivers/media/rc/keymaps/rc-pixelview.c diff --git a/drivers/media/IR/keymaps/rc-powercolor-real-angel.c b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c index 7cef8190a22..7cef8190a22 100644 --- a/drivers/media/IR/keymaps/rc-powercolor-real-angel.c +++ b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c diff --git a/drivers/media/IR/keymaps/rc-proteus-2309.c b/drivers/media/rc/keymaps/rc-proteus-2309.c index 22e92d39dee..22e92d39dee 100644 --- a/drivers/media/IR/keymaps/rc-proteus-2309.c +++ b/drivers/media/rc/keymaps/rc-proteus-2309.c diff --git a/drivers/media/IR/keymaps/rc-purpletv.c b/drivers/media/rc/keymaps/rc-purpletv.c index 4e20fc2269f..4e20fc2269f 100644 --- a/drivers/media/IR/keymaps/rc-purpletv.c +++ b/drivers/media/rc/keymaps/rc-purpletv.c diff --git a/drivers/media/IR/keymaps/rc-pv951.c b/drivers/media/rc/keymaps/rc-pv951.c index 36679e706cf..36679e706cf 100644 --- a/drivers/media/IR/keymaps/rc-pv951.c +++ b/drivers/media/rc/keymaps/rc-pv951.c diff --git a/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c index cc6b8f54874..cc6b8f54874 100644 --- a/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c diff --git a/drivers/media/IR/keymaps/rc-rc5-tv.c b/drivers/media/rc/keymaps/rc-rc5-tv.c index 73cce2f8ddf..73cce2f8ddf 100644 --- a/drivers/media/IR/keymaps/rc-rc5-tv.c +++ b/drivers/media/rc/keymaps/rc-rc5-tv.c diff --git a/drivers/media/IR/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c index 6da955dfef4..6da955dfef4 100644 --- a/drivers/media/IR/keymaps/rc-rc6-mce.c +++ b/drivers/media/rc/keymaps/rc-rc6-mce.c diff --git a/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c index ab1a6d2baf7..ab1a6d2baf7 100644 --- a/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c +++ b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c diff --git a/drivers/media/IR/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c index df32013a321..df32013a321 100644 --- a/drivers/media/IR/keymaps/rc-streamzap.c +++ b/drivers/media/rc/keymaps/rc-streamzap.c diff --git a/drivers/media/IR/keymaps/rc-tbs-nec.c b/drivers/media/rc/keymaps/rc-tbs-nec.c index 3309631e6f8..3309631e6f8 100644 --- a/drivers/media/IR/keymaps/rc-tbs-nec.c +++ b/drivers/media/rc/keymaps/rc-tbs-nec.c diff --git a/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c index 5326a0b444c..5326a0b444c 100644 --- a/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c +++ b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c diff --git a/drivers/media/IR/keymaps/rc-terratec-slim.c b/drivers/media/rc/keymaps/rc-terratec-slim.c index 10dee4c1def..10dee4c1def 100644 --- a/drivers/media/IR/keymaps/rc-terratec-slim.c +++ b/drivers/media/rc/keymaps/rc-terratec-slim.c diff --git a/drivers/media/IR/keymaps/rc-tevii-nec.c b/drivers/media/rc/keymaps/rc-tevii-nec.c index e30d411c07b..e30d411c07b 100644 --- a/drivers/media/IR/keymaps/rc-tevii-nec.c +++ b/drivers/media/rc/keymaps/rc-tevii-nec.c diff --git a/drivers/media/IR/keymaps/rc-total-media-in-hand.c b/drivers/media/rc/keymaps/rc-total-media-in-hand.c index fd198576378..fd198576378 100644 --- a/drivers/media/IR/keymaps/rc-total-media-in-hand.c +++ b/drivers/media/rc/keymaps/rc-total-media-in-hand.c diff --git a/drivers/media/IR/keymaps/rc-trekstor.c b/drivers/media/rc/keymaps/rc-trekstor.c index 91092caca45..91092caca45 100644 --- a/drivers/media/IR/keymaps/rc-trekstor.c +++ b/drivers/media/rc/keymaps/rc-trekstor.c diff --git a/drivers/media/IR/keymaps/rc-tt-1500.c b/drivers/media/rc/keymaps/rc-tt-1500.c index bc88de011d5..bc88de011d5 100644 --- a/drivers/media/IR/keymaps/rc-tt-1500.c +++ b/drivers/media/rc/keymaps/rc-tt-1500.c diff --git a/drivers/media/IR/keymaps/rc-twinhan1027.c b/drivers/media/rc/keymaps/rc-twinhan1027.c index 0b5d356c2d8..0b5d356c2d8 100644 --- a/drivers/media/IR/keymaps/rc-twinhan1027.c +++ b/drivers/media/rc/keymaps/rc-twinhan1027.c diff --git a/drivers/media/IR/keymaps/rc-videomate-s350.c b/drivers/media/rc/keymaps/rc-videomate-s350.c index 4df7fcd1d2f..4df7fcd1d2f 100644 --- a/drivers/media/IR/keymaps/rc-videomate-s350.c +++ b/drivers/media/rc/keymaps/rc-videomate-s350.c diff --git a/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c index 776b0a638d8..776b0a638d8 100644 --- a/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c +++ b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c diff --git a/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c index 9d2d550aaa9..9d2d550aaa9 100644 --- a/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c +++ b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c diff --git a/drivers/media/IR/keymaps/rc-winfast.c b/drivers/media/rc/keymaps/rc-winfast.c index 0e90a3bd949..0e90a3bd949 100644 --- a/drivers/media/IR/keymaps/rc-winfast.c +++ b/drivers/media/rc/keymaps/rc-winfast.c diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/rc/lirc_dev.c index 756656e17bd..756656e17bd 100644 --- a/drivers/media/IR/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c diff --git a/drivers/media/IR/mceusb.c b/drivers/media/rc/mceusb.c index 392ca24132d..392ca24132d 100644 --- a/drivers/media/IR/mceusb.c +++ b/drivers/media/rc/mceusb.c diff --git a/drivers/media/IR/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index acc729c79ce..acc729c79ce 100644 --- a/drivers/media/IR/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c diff --git a/drivers/media/IR/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h index 62dc53017c8..62dc53017c8 100644 --- a/drivers/media/IR/nuvoton-cir.h +++ b/drivers/media/rc/nuvoton-cir.h diff --git a/drivers/media/IR/rc-map.c b/drivers/media/rc/rc-map.c index 689143f2fff..689143f2fff 100644 --- a/drivers/media/IR/rc-map.c +++ b/drivers/media/rc/rc-map.c diff --git a/drivers/media/IR/streamzap.c b/drivers/media/rc/streamzap.c index 3a20aef67d0..3a20aef67d0 100644 --- a/drivers/media/IR/streamzap.c +++ b/drivers/media/rc/streamzap.c |