Russell King 2ff56fadd9 [media] rc: allow rc modules to be loaded if rc-main is not a module ...

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: 631493ecac ("[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>

2015-11-19 08:41:06 -02:00

..

accessibility

…

acpi

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

amba

…

android

…

ata

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-11-13 20:35:54 -08:00

atm

…

auxdisplay

…

base

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

bcma

…

block

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2015-11-13 09:24:40 -08:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-11-10 18:11:41 -08:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

cdrom

…

char

Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for-linus

2015-11-12 20:38:04 +11:00

clk

Merge tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux

2015-11-12 15:26:39 -08:00

clocksource

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-11-15 09:10:53 -08:00

connector

mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd

2015-11-06 17:50:42 -08:00

cpufreq

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

cpuidle

cpuidle: mvebu: disable the bind/unbind attributes and use builtin_platform_driver

2015-10-23 12:40:48 +02:00

crypto

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

dca

…

devfreq

…

dio

…

dma

Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2015-11-10 10:05:17 -08:00

dma-buf

dma-buf/fence: add fence_wait_any_timeout function v2

2015-10-30 01:16:16 -04:00

edac

Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2015-11-06 14:22:15 -08:00

eisa

…

extcon

Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4', 'ib-mfd-regmap-4.4' and 'ib-mfd-regulator-4.4' into ibs-for-mfd-merged

2015-10-26 14:48:22 +00:00

firewire

Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

2015-11-11 10:21:34 -08:00

firmware

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

fmc

…

fpga

fpga: socfpga: Fix check of return value of devm_request_irq

2015-10-29 15:20:25 -07:00

gpio

Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2015-11-06 14:22:15 -08:00

gpu

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-11-13 09:12:38 -08:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2015-11-07 12:49:27 -08:00

hsi

hsi: controllers:remove redundant code

2015-10-30 16:10:40 +01:00

hv

drivers/hv: share Hyper-V SynIC constants with userspace

2015-11-04 16:24:33 +01:00

hwmon

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

hwspinlock

…

hwtracing

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-11-13 20:04:17 -08:00

i2c

Merge branch 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2015-11-10 11:58:25 -08:00

ide

mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM

2015-11-06 17:50:42 -08:00

idle

…

iio

Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2015-11-05 13:15:12 -08:00

infiniband

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-11-13 20:35:54 -08:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-11-13 21:41:14 -08:00

iommu

mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd

2015-11-06 17:50:42 -08:00

ipack

…

irqchip

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-11-15 09:10:53 -08:00

isdn

Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-11-04 21:35:12 -08:00

leds

Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2015-11-05 13:15:12 -08:00

lguest

…

lightnvm

block: change ->make_request_fn() and users to return a queue cookie

2015-11-07 10:40:46 -07:00

macintosh

…

mailbox

mailbox: mailbox-test: avoid reading iomem twice

2015-11-04 14:03:04 +05:30

mcb

mcb: Destroy IDA on module unload

2015-10-29 09:02:16 +09:00

md

Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block

2015-11-10 17:23:49 -08:00

media

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

2015-11-19 08:41:06 -02:00

memory

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

memstick

…

message

Merge tag '4.4-scsi-mkp' into misc

2015-11-12 07:06:18 -05:00

mfd

[media] include/media: move platform_data to linux/platform_data/media

2015-11-17 06:58:42 -02:00

misc

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-11-13 20:04:17 -08:00

mmc

Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2015-11-05 13:15:12 -08:00

mtd

Merge tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs

2015-11-10 16:35:06 -08:00

net

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-11-13 20:04:17 -08:00

nfc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-11-10 18:11:41 -08:00

ntb

NTB: fix 32-bit compiler warning

2015-11-08 16:24:43 -05:00

nubus

…

nvdimm

libnvdimm, pmem: fix size trim in pmem_direct_access()

2015-11-12 09:55:23 -08:00

nvme

NVMe: add support for Apple NVMe controller

2015-11-11 09:36:57 -07:00

nvmem

…

of

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

oprofile

…

parisc

pci: remove pci_dma_supported

2015-11-10 16:32:11 -08:00

parport

…

pci

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-11-12 11:50:33 -08:00

pcmcia

…

perf

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2015-11-04 14:47:13 -08:00

phy

phy: qcom-ufs: fix build error when the component is built as a module

2015-11-09 17:44:24 -05:00

pinctrl

Merge tag 'gpio-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2015-11-02 12:59:12 -08:00

platform

Merge tag 'chrome-platform-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform

2015-11-13 21:53:18 -08:00

pnp

…

power

Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-11-06 10:23:50 -08:00

powercap

powercap / RAPL: Enable Broxton RAPL support

2015-10-16 22:30:48 +02:00

pps

…

ps3

…

ptp

…

pwm

Merge tag 'pwm/for-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2015-11-11 09:16:10 -08:00

rapidio

…

ras

…

regulator

Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2015-11-05 13:15:12 -08:00

remoteproc

…

reset

…

rpmsg

…

rtc

Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

2015-11-10 10:01:21 -08:00

s390

block: change ->make_request_fn() and users to return a queue cookie

2015-11-07 10:40:46 -07:00

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-11-13 20:35:54 -08:00

sfi

…

sh

…

sn

…

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

spi

Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next

2015-11-04 11:02:16 +00:00

spmi

Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-11-04 22:15:15 -08:00

ssb

ssb: add Kconfig entry for compiling SoC related code

2015-10-28 21:05:21 +02:00

staging

[media] staging: omap4iss: Compiling V4L2 framework and I2C as modules is fine

2015-11-19 08:32:34 -02:00

target

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-11-13 20:35:54 -08:00

tc

…

thermal

thermal: rockchip: fix compile error

2015-11-11 19:52:39 -08:00

thunderbolt

…

tty

Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2015-11-06 14:22:15 -08:00

uio

…

usb

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-11-13 20:35:54 -08:00

uwb

Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2015-11-04 21:50:37 -08:00

vfio

Merge tag 'vfio-v4.4-rc1' of git://github.com/awilliam/linux-vfio

2015-11-13 17:05:32 -08:00

vhost

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-11-13 20:04:17 -08:00

video

Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2015-11-10 10:00:09 -08:00

virt

…

virtio

…

vlynq

…

vme

Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-11-04 22:15:15 -08:00

w1

Merge tag 'for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2015-11-05 12:28:15 -08:00

watchdog

Merge git://www.linux-watchdog.org/linux-watchdog

2015-11-10 10:11:12 -08:00

xen

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-11-13 20:04:17 -08:00

zorro

…

Kconfig

Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-11-04 22:15:15 -08:00

Makefile

Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-11-04 22:15:15 -08:00