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 / Kconfig

diff --git a/drivers/media/IR/keymaps/Kconfig b/drivers/media/rc/keymaps/Kconfig
similarity index 96%
rename from drivers/media/IR/keymaps/Kconfig
rename to drivers/media/rc/keymaps/Kconfig
index 14b22f58f823de07bc98e6fce3e80154c5ddb933..8e615fd55852977e821c9816ef7d09cf3ede62cd 100644 (file)
--- a/drivers/media/IR/keymaps/Kconfig
+++ b/drivers/media/rc/keymaps/Kconfig
@@ -1,6 +1,6 @@
 config RC_MAP
        tristate "Compile Remote Controller keymap modules"
-       depends on IR_CORE
+       depends on RC_CORE
        default y
 
        ---help---