diff options
author | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
commit | ae6e59caefd8d4097ccb096c95df95ec7e52fe88 (patch) | |
tree | f72b77d41c9f5a3b18fb52e505d60dba2ad913a5 /arch/powerpc/boot/dts/socrates.dts | |
parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
parent | f379188958ae8af30105eb1f27d0e0abf6a51558 (diff) | |
download | blackbird-op-linux-ae6e59caefd8d4097ccb096c95df95ec7e52fe88.tar.gz blackbird-op-linux-ae6e59caefd8d4097ccb096c95df95ec7e52fe88.zip |
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/boot/dts/socrates.dts')
-rw-r--r-- | arch/powerpc/boot/dts/socrates.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts index b8d0fc6f0042..04c398862e03 100644 --- a/arch/powerpc/boot/dts/socrates.dts +++ b/arch/powerpc/boot/dts/socrates.dts @@ -52,6 +52,7 @@ soc8544@e0000000 { #address-cells = <1>; #size-cells = <1>; + device_type = "soc"; ranges = <0x00000000 0xe0000000 0x00100000>; reg = <0xe0000000 0x00001000>; // CCSRBAR 1M |