Skip to content

L
linux-davinci
Commit ce016ca2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Manual merge to avoid conflicts

parent 0e3c41b1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/arm/Kconfig
View file @ ce016ca2
...@@ -687,9 +687,9 @@ source "drivers/block/Kconfig" ...@@ -687,9 +687,9 @@ source "drivers/block/Kconfig"
source "drivers/acorn/block/Kconfig" source "drivers/acorn/block/Kconfig"
if ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_L7200 \ if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \
|| ARCH_LH7A40X || ARCH_PXA || ARCH_RPC || ARCH_S3C2410 \ || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
|| ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE || PCMCIA || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment