Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 0 insertions, 15 deletions

diff --git a/drivers/media/IR/keymaps/Kconfig b/drivers/media/IR/keymaps/Kconfig
deleted file mode 100644
index 14b22f58f823..000000000000
--- a/drivers/media/IR/keymaps/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-config RC_MAP
-        tristate "Compile Remote Controller keymap modules"
-        depends on IR_CORE
-        default y
-
-        ---help---
-           This option enables the compilation of lots of Remote
-           Controller tables. They are short tables, but if you
-           don't use a remote controller, or prefer to load the
-           tables on userspace, you should disable it.
-
-           The ir-keytable program, available at v4l-utils package
-           provide the tool and the same RC maps for load from
-           userspace. Its available at
-                        http://git.linuxtv.org/v4l-utils