diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
commit | c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7 (patch) | |
tree | fd013d6f38b25fd1c3890a7f4ad9aa25311e7f54 /arch/arm/boot/dts/kirkwood-ib62x0.dts | |
parent | 49121304a9831449a841ca0c77dc0ad8697e23c9 (diff) | |
parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
download | op-kernel-dev-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.zip op-kernel-dev-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.tar.gz |
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
From Andrew Lunn <andrew@lunn.ch>:
* 'v3.5-rc7-fixes' of git://github.com/lunn/linux:
ARM: Kirkwood: Replace mrvl with marvell
ARM: Orion: fix driver probe error handling with respect to clk
ARM: Dove: Fixup ge00 initialisation
ARM: Kirkwood: Fix PHY disable clk problems
ARM: Kirkwood: Ensure runit clock always ticks.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index ada0f0c..f59dcf6 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -4,7 +4,7 @@ / { model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; - compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; + compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; memory { device_type = "memory"; |