diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 19:08:11 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 19:08:11 +0900 |
| commit | 70d4f2e5576a16120e6bc85b10011032306c1179 (patch) | |
| tree | 8fe170b96167ab3aeb82980d58828942fe11668a /arch/arm/mach-shmobile/Kconfig | |
| parent | be0647d556985ae58a42e7fc3751a293c418c41e (diff) | |
| parent | 250d829f68ecb5e775a99deb03c56832acec28f4 (diff) | |
| download | linux-stable-70d4f2e5576a16120e6bc85b10011032306c1179.tar.gz linux-stable-70d4f2e5576a16120e6bc85b10011032306c1179.tar.bz2 linux-stable-70d4f2e5576a16120e6bc85b10011032306c1179.zip | |
Merge branch 'heads/soc2' into boards2-base
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 3e57d457308a..cd89d6348e0e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -12,6 +12,7 @@ config ARCH_SHMOBILE_MULTI select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0 + select MIGHT_HAVE_PCI select NO_IOPORT select PINCTRL select ARCH_REQUIRE_GPIOLIB @@ -111,6 +112,7 @@ config ARCH_R8A7790 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 + select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC @@ -119,6 +121,7 @@ config ARCH_R8A7791 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 + select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC @@ -127,6 +130,7 @@ config ARCH_EMEV2 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 + select MIGHT_HAVE_PCI select USE_OF select AUTO_ZRELADDR @@ -265,6 +269,7 @@ config MACH_KOELSCH bool "Koelsch board" depends on ARCH_R8A7791 select USE_OF + select MICREL_PHY if SH_ETH config MACH_KOELSCH_REFERENCE bool "Koelsch board - Reference Device Tree Implementation" |