[PATCH] dmfe warning fix

[linux-2.6] / drivers / net / tulip / dmfe.c

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 04539fca270f6267274af41c3ab1dca7cd453db9..7b899702ceb946374f7ee7dd2466ed68f6f5a1ea 100644 (file)
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1802,7 +1802,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
        if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
                /* SROM V4.01 */
                /* Get NIC support media mode */
-               db->NIC_capability = le16_to_cpup(srom + 34);
+               db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);
                db->PHY_reg4 = 0;
                for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
                        switch( db->NIC_capability & tmp_reg ) {
@@ -1814,7 +1814,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
                }
 
                /* Media Mode Force or not check */
-               dmfe_mode = le32_to_cpup(srom + 34) & le32_to_cpup(srom + 36);
+               dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &
+                               le32_to_cpup((__le32 *)srom + 36/4);
                switch(dmfe_mode) {
                case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
                case 0x2: dmfe_media_mode = DMFE_10MFD; break;  /* 10MFD */