From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 15 Oct 2015 16:15:24 +0000 (-0300)
Subject: rc: allow rc modules to be loaded if rc-main is not a module
X-Git-Tag: v3.2.77~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3277e201df72bbe0617e1b87ed7fa78361f6f88;p=pandora-kernel.git

rc: allow rc modules to be loaded if rc-main is not a module

commit 2ff56fadd94cdaeeaeccbc0a9b703a0101ada128 upstream.

rc-main mistakenly uses #ifdef MODULE to determine whether it should
load the rc keymap modules.  This symbol is only defined if rc-main
is being built as a module itself, and bears no relation to whether
the rc keymaps are modules.

Fix this to use CONFIG_MODULES instead.

Fixes: 631493ecacd8 ("[media] rc-core: merge rc-map.c into rc-main.c")

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

Reading git-diff-tree failed