diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /arch/powerpc/boot/dts/mpc832x_rdb.dts | |
| parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'arch/powerpc/boot/dts/mpc832x_rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 226ff066652b..dea30910c136 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | #size-cells = <1>; | 18 | #size-cells = <1>; |
| 19 | 19 | ||
| 20 | aliases { | 20 | aliases { |
| 21 | ethernet0 = &enet0; | 21 | ethernet0 = &enet1; |
| 22 | ethernet1 = &enet1; | 22 | ethernet1 = &enet0; |
| 23 | serial0 = &serial0; | 23 | serial0 = &serial0; |
| 24 | serial1 = &serial1; | 24 | serial1 = &serial1; |
| 25 | pci0 = &pci0; | 25 | pci0 = &pci0; |