summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/Kconfig
diff options
context:
space:
mode:
authorBenjamin Cama <benoar@dolka.fr>2015-08-06 18:29:52 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-08-06 18:51:29 +0200
commit15979aeeb548e020b6107214f0405be894891a57 (patch)
treee7d909f274e496c7d380f0e3132c87d43dfd3e2a /arch/arm/mach-orion5x/Kconfig
parentcba3bbcba41f8534df5529752d10dc69b7b38eda (diff)
downloadblackbird-op-linux-15979aeeb548e020b6107214f0405be894891a57.tar.gz
blackbird-op-linux-15979aeeb548e020b6107214f0405be894891a57.zip
ARM: dts: Convert Linkstation Mini to Device Tree
The title says it all. The name of the dts file as been changed to better reflect the manufacturer's device name (LS-WSGL), rather than the original "lsmini", which exists in a kirkwood version too. [gregory.clement@free-electrons.com]: use tab instead of space to indent dts at line 185. Reslove merge conflict with patch "ARM: dts: orion5x: add buffalo linkstation ls-wtgl" in the file arch/arm/boot/dts/Makefile. Signed-off-by: Benjamin Cama <benoar@dolka.fr> Acked-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Alexey Kopytko <alexey@kopytko.ru> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-orion5x/Kconfig')
-rw-r--r--arch/arm/mach-orion5x/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 2412efb6cdd9..08d2be2ea41f 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -78,11 +78,11 @@ config MACH_LINKSTATION_LSCHL
Buffalo Linkstation Live v3 (LS-CHL) platform.
config MACH_LINKSTATION_MINI
- bool "Buffalo Linkstation Mini"
- select I2C_BOARDINFO
+ bool "Buffalo Linkstation Mini (Flattened Device Tree)"
+ select ARCH_ORION5X_DT
help
Say 'Y' here if you want your kernel to support the
- Buffalo Linkstation Mini platform.
+ Buffalo Linkstation Mini (LS-WSGL) platform.
config MACH_LINKSTATION_LS_HGL
bool "Buffalo Linkstation LS-HGL"
OpenPOWER on IntegriCloud