diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /arch/powerpc/boot/dts/mpc8378_rdb.dts | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8378_rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8378_rdb.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 92711534b179..711f9a30f9ab 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
| @@ -143,7 +143,6 @@ | |||
| 143 | mode = "cpu"; | 143 | mode = "cpu"; |
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ | ||
| 147 | usb@23000 { | 146 | usb@23000 { |
| 148 | compatible = "fsl-usb2-dr"; | 147 | compatible = "fsl-usb2-dr"; |
| 149 | reg = <0x23000 0x1000>; | 148 | reg = <0x23000 0x1000>; |
| @@ -151,7 +150,7 @@ | |||
| 151 | #size-cells = <0>; | 150 | #size-cells = <0>; |
| 152 | interrupt-parent = <&ipic>; | 151 | interrupt-parent = <&ipic>; |
| 153 | interrupts = <38 0x8>; | 152 | interrupts = <38 0x8>; |
| 154 | phy_type = "utmi"; | 153 | phy_type = "ulpi"; |
| 155 | }; | 154 | }; |
| 156 | 155 | ||
| 157 | mdio@24520 { | 156 | mdio@24520 { |