Merge branch 'r8169-for-jeff-20070806' of git://electric-eye.fr.zoreil.com/home/romie...

[pandora-kernel.git] / drivers / net / skfp / fplustm.c

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index a4b2b69..a45205d 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -22,7 +22,7 @@
 #include "h/fddi.h"
 #include "h/smc.h"
 #include "h/supern_2.h"
-#include "can.c"
+#include <linux/bitrev.h>
 
 #ifndef        lint
 static const char ID_sccs[] = "@(#)fplustm.c   1.32 99/02/23 (C) SK " ;
@@ -549,12 +549,12 @@ void formac_tx_restart(struct s_smc *smc)
 static void enable_formac(struct s_smc *smc)
 {
        /* set formac IMSK : 0 enables irq */
-       outpw(FM_A(FM_IMSK1U),~mac_imsk1u) ;
-       outpw(FM_A(FM_IMSK1L),~mac_imsk1l) ;
-       outpw(FM_A(FM_IMSK2U),~mac_imsk2u) ;
-       outpw(FM_A(FM_IMSK2L),~mac_imsk2l) ;
-       outpw(FM_A(FM_IMSK3U),~mac_imsk3u) ;
-       outpw(FM_A(FM_IMSK3L),~mac_imsk3l) ;
+       outpw(FM_A(FM_IMSK1U),(unsigned short)~mac_imsk1u);
+       outpw(FM_A(FM_IMSK1L),(unsigned short)~mac_imsk1l);
+       outpw(FM_A(FM_IMSK2U),(unsigned short)~mac_imsk2u);
+       outpw(FM_A(FM_IMSK2L),(unsigned short)~mac_imsk2l);
+       outpw(FM_A(FM_IMSK3U),(unsigned short)~mac_imsk3u);
+       outpw(FM_A(FM_IMSK3L),(unsigned short)~mac_imsk3l);
 }
 
 #if 0  /* Removed because the driver should use the ASICs TX complete IRQ. */
@@ -1073,7 +1073,7 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc,
        if (can) {
                p = own->a ;
                for (i = 0 ; i < 6 ; i++, p++)
-                       *p = canonical[*p] ;
+                       *p = bitrev8(*p);
        }
        slot = NULL;
        for (i = 0, tb = smc->hw.fp.mc.table ; i < FPMAX_MULTICAST ; i++, tb++){