diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:20:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:20:41 -0800 |
| commit | 3298a3511f1e73255a8dc023efd909e569eea037 (patch) | |
| tree | 2d8e9bdb9e398049e3876b99fbb4d51099a45cc3 /drivers/media | |
| parent | 5ce7aba976ebdfbf467e3cbcd3a7536ebdec4b11 (diff) | |
| parent | acb7452369e4f8749dd32d48dbda98936035a87c (diff) | |
| download | linux-3.10-3298a3511f1e73255a8dc023efd909e569eea037.tar.gz linux-3.10-3298a3511f1e73255a8dc023efd909e569eea037.tar.bz2 linux-3.10-3298a3511f1e73255a8dc023efd909e569eea037.zip | |
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC multiplatform support from Arnd Bergmann:
"Converting more ARM platforms to multiplatform support. This time,
OMAP gets converted, which is a major step since this is by far the
largest platform in terms of code size. The same thing happens to the
vt8500 platform."
* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
net: cwdavinci_cpdma: export symbols for cpsw
remoteproc: omap: depend on OMAP_MBOX_FWK
[media] davinci: do not include mach/hardware.h
ARM: OMAP2+: Make sure files with omap initcalls include soc.h
ARM: OMAP2+: Include soc.h to drm.c to fix compiling
ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall
ARM: multi_v7_defconfig: add ARCH_ZYNQ
ARM: multi_v7_defconfig: remove unnecessary CONFIG_GPIOLIB
arm: vt8500: Remove remaining mach includes
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove single platform Kconfig options
ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S
ARM: OMAP2+: Add minimal support for booting vexpress
ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
ARM: OMAP2+: Disable code that currently does not work with multiplaform
ARM: OMAP2+: Add multiplatform debug_ll support
ARM: OMAP: Fix dmaengine init for multiplatform
ARM: OMAP: Fix i2c cmdline initcall for multiplatform
ARM: OMAP2+: Use omap initcalls
ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/davinci/vpss.c | 1 | ||||
| -rw-r--r-- | drivers/media/rc/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c index cdbff88e0f1..684e815a81b 100644 --- a/drivers/media/platform/davinci/vpss.c +++ b/drivers/media/platform/davinci/vpss.c @@ -25,7 +25,6 @@ #include <linux/spinlock.h> #include <linux/compiler.h> #include <linux/io.h> -#include <mach/hardware.h> #include <media/davinci/vpss.h> MODULE_LICENSE("GPL"); diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 79ba242fe26..19f3563c61d 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -291,7 +291,7 @@ config IR_TTUSBIR config IR_RX51 tristate "Nokia N900 IR transmitter diode" - depends on OMAP_DM_TIMER && LIRC + depends on OMAP_DM_TIMER && LIRC && !ARCH_MULTIPLATFORM ---help--- Say Y or M here if you want to enable support for the IR transmitter diode built in the Nokia N900 (RX51) device. |