Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / platforms / 4xx / ibmnp405h.c

diff --git a/arch/ppc/platforms/4xx/ibmnp405h.c b/arch/ppc/platforms/4xx/ibmnp405h.c
index ecdc5be..f1dcb0a 100644 (file)
--- a/arch/ppc/platforms/4xx/ibmnp405h.c
+++ b/arch/ppc/platforms/4xx/ibmnp405h.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmnp405h.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2000-2002 (c) MontaVista, Software, Inc.  This file is licensed under
@@ -34,7 +32,7 @@ static struct ocp_func_emac_data ibmnp405h_emac1_def = {
        .zmii_mux       = 1,            /* ZMII input of this EMAC */
        .mal_idx        = 0,            /* MAL device index */
        .mal_rx_chan    = 1,            /* MAL rx channel number */
-       .mal_tx_chan    = 1,            /* MAL tx channel number */
+       .mal_tx_chan    = 2,            /* MAL tx channel number */
        .wol_irq        = 41,           /* WOL interrupt number */
        .mdio_idx       = -1,           /* No shared MDIO */
        .tah_idx        = -1,           /* No TAH */
@@ -46,7 +44,7 @@ static struct ocp_func_emac_data ibmnp405h_emac2_def = {
        .zmii_mux       = 2,            /* ZMII input of this EMAC */
        .mal_idx        = 0,            /* MAL device index */
        .mal_rx_chan    = 2,            /* MAL rx channel number */
-       .mal_tx_chan    = 2,            /* MAL tx channel number */
+       .mal_tx_chan    = 4,            /* MAL tx channel number */
        .wol_irq        = 41,           /* WOL interrupt number */
        .mdio_idx       = -1,           /* No shared MDIO */
        .tah_idx        = -1,           /* No TAH */
@@ -58,7 +56,7 @@ static struct ocp_func_emac_data ibmnp405h_emac3_def = {
        .zmii_mux       = 3,            /* ZMII input of this EMAC */
        .mal_idx        = 0,            /* MAL device index */
        .mal_rx_chan    = 3,            /* MAL rx channel number */
-       .mal_tx_chan    = 3,            /* MAL tx channel number */
+       .mal_tx_chan    = 6,            /* MAL tx channel number */
        .wol_irq        = 41,           /* WOL interrupt number */
        .mdio_idx       = -1,           /* No shared MDIO */
        .tah_idx        = -1,           /* No TAH */
@@ -73,6 +71,7 @@ static struct ocp_func_mal_data ibmnp405h_mal0_def = {
        .txde_irq       = 46,           /* TX Descriptor Error IRQ */
        .rxde_irq       = 47,           /* RX Descriptor Error IRQ */
        .serr_irq       = 45,           /* MAL System Error IRQ    */
+       .dcr_base       = DCRN_MAL_BASE /* MAL0_CFG DCR number */
 };
 OCP_SYSFS_MAL_DATA()