diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
commit | 3fbb96d275989c604b343b9e39aeea50386756e9 (patch) | |
tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a /arch/arm/Kconfig | |
parent | Merge branch 'u300-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup (diff) | |
parent | Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci (diff) | |
download | linux-dev-3fbb96d275989c604b343b9e39aeea50386756e9.tar.xz linux-dev-3fbb96d275989c604b343b9e39aeea50386756e9.zip |
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial
conflict.
* cleanup/io-pci:
ARM: Fix ioremap() of address zero
Also includes an update to Linux 3.6-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0c2e1dd9adf3..24d955c21d35 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -38,7 +38,6 @@ config ARM select HARDIRQS_SW_RESEND select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW - select GENERIC_IRQ_PROBE select ARCH_WANT_IPC_PARSE_VERSION select HARDIRQS_SW_RESEND select CPU_PM if (SUSPEND || CPU_IDLE) @@ -126,11 +125,6 @@ config TRACE_IRQFLAGS_SUPPORT bool default y -config GENERIC_LOCKBREAK - bool - default y - depends on SMP && PREEMPT - config RWSEM_GENERIC_SPINLOCK bool default y |