diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /arch/powerpc/boot | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index f5c3086bcb5d..3bc32029ca5b 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
| @@ -97,6 +97,7 @@ | |||
| 97 | #size-cells = <0>; | 97 | #size-cells = <0>; |
| 98 | interrupt-parent = < &ipic >; | 98 | interrupt-parent = < &ipic >; |
| 99 | interrupts = <26 8>; | 99 | interrupts = <26 8>; |
| 100 | dr_mode = "peripheral"; | ||
| 100 | phy_type = "ulpi"; | 101 | phy_type = "ulpi"; |
| 101 | }; | 102 | }; |
| 102 | 103 | ||