summaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-08-12 18:05:30 +0000
committerJason Cooper <jason@lakedaemon.net>2013-08-12 18:44:28 +0000
commitd04d97c2646dc436ef81ecd3b51e3ca50c716d0d (patch)
tree0c86bdf909dcd8905262e8a448feee26f671d401 /arch/arm/mach-kirkwood
parent844703c1addb01f83c74a4d284a418263867304d (diff)
ARM: kirkwood: fix DT building and update defconfig
commit 844703c ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code removed the last kirkwood DT/platform board in kirkwood_defconfig, this triggered a rescan of the config symbols, the result of which breaks the build because KIRKWOOD_DT does not select OF_IRQ. This commit fixes the regression and updates the defconfig to explicitly enable SERIAL_OF_PLATFORM and KIRWOOD_DT. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 94540d5cb75b..fe8319ad3158 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -93,6 +93,7 @@ comment "Device tree entries"
config ARCH_KIRKWOOD_DT
bool "Marvell Kirkwood Flattened Device Tree"
select KIRKWOOD_CLK
+ select OF_IRQ
select ORION_IRQCHIP
select ORION_TIMER
select POWER_SUPPLY
@@ -107,7 +108,7 @@ config ARCH_KIRKWOOD_DT
config MACH_MV88F6281GTW_GE_DT
bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)"
- select ARCH_KIRKWOOD_DT
+ depends on ARCH_KIRKWOOD_DT
help
Say 'Y' here if you want your kernel to support the
Marvell 88F6281 GTW GE Board (Flattened Device Tree).