diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-30 00:39:43 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-30 00:39:43 +0400 |
| commit | 8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch) | |
| tree | 58b31d3d9514df93974216f190824d73f9816d9f /arch/arm/boot/dts/ste-ccu8540.dts | |
| parent | 263c08af44741697202b85e631a964ee85200eb0 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| download | linux-8320857b1d168fd17d7cee48bbfd04aaf6797be8.tar.xz | |
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'arch/arm/boot/dts/ste-ccu8540.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-ccu8540.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts index 7f3baf51a3a9..32dd55e5f4e6 100644 --- a/arch/arm/boot/dts/ste-ccu8540.dts +++ b/arch/arm/boot/dts/ste-ccu8540.dts @@ -18,6 +18,7 @@ compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; memory@0 { + device_type = "memory"; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; }; |