diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-23 22:42:09 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-23 22:42:09 +0100 |
| commit | 12cbfd0a3c52a52c2948c91b9e62e73c468d1572 (patch) | |
| tree | 9252b3929159a83fc81ca0a48706bfa959660967 /drivers/media/rc/ir-raw.c | |
| parent | [media] rc: Add support for decoding Sanyo protocol (diff) | |
| parent | Linux 3.2-rc2 (diff) | |
| download | linux-12cbfd0a3c52a52c2948c91b9e62e73c468d1572.tar.xz linux-12cbfd0a3c52a52c2948c91b9e62e73c468d1572.zip | |
Merge tag 'v3.2-rc2' into staging/for_v3.3
* tag 'v3.2-rc2': (3068 commits)
Linux 3.2-rc2
hfs: add sanity check for file name length
fsl-rio: fix compile error
blackfin: Fixup export.h includes
Blackfin: add serial TX IRQ in individual platform resource
virtio-pci: fix use after free
ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)
drm/radeon/kms/combios: fix dynamic allocation of PM clock modes
[CPUFREQ] db8500: fix build error due to undeclared i variable
bma023: Add SFI translation for this device
vrtc: change its year offset from 1960 to 1972
ce4100: fix a build error
arm/imx: fix imx6q mmc error when mounting rootfs
arm/imx: fix AUTO_ZRELADDR selection
arm/imx: fix the references to ARCH_MX3
ARM: mx51/53: set pwm clock parent to ipg_perclk
btrfs: rename the option to nospace_cache
drm/radeon/kms/pm: switch to dynamically allocating clock mode array
drm/radeon/kms: optimize r600_pm_profile_init
drm/radeon/kms/pm: add a proper pm profile init function for fusion
...
Conflicts:
drivers/media/radio/Kconfig
Diffstat (limited to 'drivers/media/rc/ir-raw.c')
| -rw-r--r-- | drivers/media/rc/ir-raw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c index 9e841f43ed4d..95e630998aaf 100644 --- a/drivers/media/rc/ir-raw.c +++ b/drivers/media/rc/ir-raw.c @@ -12,8 +12,10 @@ * GNU General Public License for more details. */ +#include <linux/export.h> #include <linux/kthread.h> #include <linux/mutex.h> +#include <linux/kmod.h> #include <linux/sched.h> #include <linux/freezer.h> #include "rc-core-priv.h" |