diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 16:17:30 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 16:18:13 -0500 |
| commit | a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d (patch) | |
| tree | 510283fbb57dc321bef9b36e37698c7fc6b588ef /arch/arm/Kconfig | |
| parent | 4d8cfec692e988b844dcaeaeb76b5780b7ef9d28 (diff) | |
| parent | 1b35af54ee9cbbdd13fed53fd4acb0952ba522e1 (diff) | |
Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes
ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers
ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h
ARM: OMAP2+: Move most of plat/io.h into local iomap.h
ARM: OMAP1: Move most of plat/io.h into local iomap.h
ARM: OMAP1: Move 16xx GPIO system clock to platform init code
ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h
ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
ARM: OMAP2+: Drop DISPC L3 firewall code
ARM: OMAP2xxx: PM: remove obsolete timer disable code in the suspend path
ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config
(update to latest rmk/for-arm-soc branch)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 92c9c79c140c..f2574fef1e41 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -186,6 +186,9 @@ config GENERIC_ISA_DMA | |||
| 186 | config FIQ | 186 | config FIQ |
| 187 | bool | 187 | bool |
| 188 | 188 | ||
| 189 | config NEED_RET_TO_USER | ||
| 190 | bool | ||
| 191 | |||
| 189 | config ARCH_MTD_XIP | 192 | config ARCH_MTD_XIP |
| 190 | bool | 193 | bool |
| 191 | 194 | ||
| @@ -479,6 +482,7 @@ config ARCH_IOP13XX | |||
| 479 | select ARCH_SUPPORTS_MSI | 482 | select ARCH_SUPPORTS_MSI |
| 480 | select VMSPLIT_1G | 483 | select VMSPLIT_1G |
| 481 | select NEED_MACH_MEMORY_H | 484 | select NEED_MACH_MEMORY_H |
| 485 | select NEED_RET_TO_USER | ||
| 482 | help | 486 | help |
| 483 | Support for Intel's IOP13XX (XScale) family of processors. | 487 | Support for Intel's IOP13XX (XScale) family of processors. |
| 484 | 488 | ||
| @@ -486,6 +490,7 @@ config ARCH_IOP32X | |||
| 486 | bool "IOP32x-based" | 490 | bool "IOP32x-based" |
| 487 | depends on MMU | 491 | depends on MMU |
| 488 | select CPU_XSCALE | 492 | select CPU_XSCALE |
| 493 | select NEED_RET_TO_USER | ||
| 489 | select PLAT_IOP | 494 | select PLAT_IOP |
| 490 | select PCI | 495 | select PCI |
| 491 | select ARCH_REQUIRE_GPIOLIB | 496 | select ARCH_REQUIRE_GPIOLIB |
| @@ -497,6 +502,7 @@ config ARCH_IOP33X | |||
| 497 | bool "IOP33x-based" | 502 | bool "IOP33x-based" |
| 498 | depends on MMU | 503 | depends on MMU |
| 499 | select CPU_XSCALE | 504 | select CPU_XSCALE |
| 505 | select NEED_RET_TO_USER | ||
| 500 | select PLAT_IOP | 506 | select PLAT_IOP |
| 501 | select PCI | 507 | select PCI |
| 502 | select ARCH_REQUIRE_GPIOLIB | 508 | select ARCH_REQUIRE_GPIOLIB |