diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 18:14:17 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 18:14:17 +0200 |
| commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
| tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-versatile/Kconfig | |
| parent | UAPI: (Scripted) Disintegrate arch/arm/include/asm (diff) | |
| parent | ARM: config: make sure that platforms are ordered by option string (diff) | |
| download | linux-244acb1ba3777c2eb4d33ddc246cab5419656442.tar.xz linux-244acb1ba3777c2eb4d33ddc246cab5419656442.zip | |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-versatile/Kconfig')
| -rw-r--r-- | arch/arm/mach-versatile/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index c1f38f6625b2..63d8e9f81b99 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -3,9 +3,9 @@ menu "Versatile platform type" config ARCH_VERSATILE_PB bool "Support Versatile Platform Baseboard for ARM926EJ-S" + default y select CPU_ARM926T select MIGHT_HAVE_PCI - default y help Include support for the ARM(R) Versatile Platform Baseboard for the ARM926EJ-S. @@ -19,8 +19,8 @@ config MACH_VERSATILE_AB config MACH_VERSATILE_DT bool "Support Versatile platform from device tree" - select USE_OF select CPU_ARM926T + select USE_OF help Include support for the ARM(R) Versatile/PB platform, using the device tree for discovery |