diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 18:45:25 +0400 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 18:45:25 +0400 |
| commit | 89fb2d77d5daa821e3868ea59963f28249974840 (patch) | |
| tree | 6cc80209a208133000c203cf9a9f61dd42fd53a9 /arch/arm/boot/dts/kirkwood-ib62x0.dts | |
| parent | 4297103560b4c5aba904e4711e982a039619f1f6 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
| download | linux-89fb2d77d5daa821e3868ea59963f28249974840.tar.xz | |
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3
Merge in branch already pulled. Fulfils dependancies needed by
this patchset.
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 ada0f0c23085..f59dcf6dc45f 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"; |