git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-epoll', 'pnp' and 'powercap'
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ecx-common.dtsi
diff --git
a/arch/arm/boot/dts/ecx-common.dtsi
b/arch/arm/boot/dts/ecx-common.dtsi
index bc22557d7a6a977b3cce656c115eb31e1d060398..b90045a8f8e3749f849c3e0d790e99565a313094 100644
(file)
--- a/
arch/arm/boot/dts/ecx-common.dtsi
+++ b/
arch/arm/boot/dts/ecx-common.dtsi
@@
-53,12
+53,6
@@
status = "disabled";
};
- memory-controller@fff00000 {
- compatible = "calxeda,hb-ddr-ctrl";
- reg = <0xfff00000 0x1000>;
- interrupts = <0 91 4>;
- };
-
ipc@fff20000 {
compatible = "arm,pl320", "arm,primecell";
reg = <0xfff20000 0x1000>;