diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 04:24:53 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 04:24:53 +0200 |
| commit | d1226e8f98f130918265fb5b4dddcb60b783eb34 (patch) | |
| tree | 5272a7828311a9b336d15c005704cf27b083d41c /arch/arm/Kconfig | |
| parent | Merge tag 'tegra-for-3.7-cpu-hotplug' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Merge tag 'for_3.7-omap_device' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-d1226e8f98f130918265fb5b4dddcb60b783eb34.tar.xz linux-d1226e8f98f130918265fb5b4dddcb60b783eb34.zip | |
Merge tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Kevin Hilman <khilman@ti.com>:
Updates for omap_device layer for v3.7.
Allows omap_device layer to keep track of driver bound status in order
to make more intelligent decisions about idling unused devices.
* tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: omap_device: idle devices with no driver bound
ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
ARM: OMAP: omap_device: keep track of driver bound status
+ sync to 3.6-rc5
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 60355f1cc4b4..e5a4438c333b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -6,7 +6,7 @@ config ARM select HAVE_DMA_API_DEBUG select HAVE_IDE if PCI || ISA || PCMCIA select HAVE_DMA_ATTRS - select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7) + select HAVE_DMA_CONTIGUOUS if MMU select HAVE_MEMBLOCK select RTC_LIB select SYS_SUPPORTS_APM_EMULATION |