diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /arch/powerpc/boot/dts/ebony.dts | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/boot/dts/ebony.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/ebony.dts | 2 |
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 @@ | |||
| 216 | 216 | ||
| 217 | IIC0: i2c@40000400 { | 217 | IIC0: i2c@40000400 { |
| 218 | /* FIXME */ | 218 | /* FIXME */ |
| 219 | device_type = "i2c"; | ||
| 220 | compatible = "ibm,iic-440gp", "ibm,iic"; | 219 | compatible = "ibm,iic-440gp", "ibm,iic"; |
| 221 | reg = <40000400 14>; | 220 | reg = <40000400 14>; |
| 222 | interrupt-parent = <&UIC0>; | 221 | interrupt-parent = <&UIC0>; |
| @@ -224,7 +223,6 @@ | |||
| 224 | }; | 223 | }; |
| 225 | IIC1: i2c@40000500 { | 224 | IIC1: i2c@40000500 { |
| 226 | /* FIXME */ | 225 | /* FIXME */ |
| 227 | device_type = "i2c"; | ||
| 228 | compatible = "ibm,iic-440gp", "ibm,iic"; | 226 | compatible = "ibm,iic-440gp", "ibm,iic"; |
| 229 | reg = <40000500 14>; | 227 | reg = <40000500 14>; |
| 230 | interrupt-parent = <&UIC0>; | 228 | interrupt-parent = <&UIC0>; |