diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /arch/powerpc/boot/dts/mpc832x_rdb.dts | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
| download | op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.zip op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
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 226ff06..dea3091 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -18,8 +18,8 @@ #size-cells = <1>; aliases { - ethernet0 = &enet0; - ethernet1 = &enet1; + ethernet0 = &enet1; + ethernet1 = &enet0; serial0 = &serial0; serial1 = &serial1; pci0 = &pci0; |
