summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/dts/ebony.dts
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-24 07:38:20 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-24 07:38:20 +0300
commit8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch)
treee0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/powerpc/boot/dts/ebony.dts
parent1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff)
parent038eb0ea04b245351be34b0ae76b55eee4603989 (diff)
downloadlinux-8d3c202be23c5a915f7053ebd4e96f44700c6a62.tar.xz
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/powerpc/boot/dts/ebony.dts')
-rw-r--r--arch/powerpc/boot/dts/ebony.dts2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 7aad135a44b0..0b000cb7ed8b 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -216,7 +216,6 @@
IIC0: i2c@40000400 {
/* FIXME */
- device_type = "i2c";
compatible = "ibm,iic-440gp", "ibm,iic";
reg = <40000400 14>;
interrupt-parent = <&UIC0>;
@@ -224,7 +223,6 @@
};
IIC1: i2c@40000500 {
/* FIXME */
- device_type = "i2c";
compatible = "ibm,iic-440gp", "ibm,iic";
reg = <40000500 14>;
interrupt-parent = <&UIC0>;