linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / skfp / fplustm.c

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 0784f55..a2ed47f 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -89,21 +89,21 @@ static const u_short my_sagp = 0xffff ;     /* short group address (n.u.) */
 /*
  * useful interrupt bits
  */
-static const int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ;
-static const int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0|
+static int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ;
+static int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0|
                        FM_STBURS | FM_STBURA0 ;
 
        /* delete FM_SRBFL after tests */
-static const int mac_imsk2u = FM_SERRSF | FM_SNFSLD | FM_SRCVOVR | FM_SRBFL |
+static int mac_imsk2u = FM_SERRSF | FM_SNFSLD | FM_SRCVOVR | FM_SRBFL |
                        FM_SMYCLM ;
-static const int mac_imsk2l = FM_STRTEXR | FM_SDUPCLM | FM_SFRMCTR |
+static int mac_imsk2l = FM_STRTEXR | FM_SDUPCLM | FM_SFRMCTR |
                        FM_SERRCTR | FM_SLSTCTR |
                        FM_STRTEXP | FM_SMULTDA | FM_SRNGOP ;
 
-static const int mac_imsk3u = FM_SRCVOVR2 | FM_SRBFL2 ;
-static const int mac_imsk3l = FM_SRPERRQ2 | FM_SRPERRQ1 ;
+static int mac_imsk3u = FM_SRCVOVR2 | FM_SRBFL2 ;
+static int mac_imsk3l = FM_SRPERRQ2 | FM_SRPERRQ1 ;
 
-static const int mac_beacon_imsk2u = FM_SOTRBEC | FM_SMYBEC | FM_SBEC |
+static int mac_beacon_imsk2u = FM_SOTRBEC | FM_SMYBEC | FM_SBEC |
                        FM_SLOCLM | FM_SHICLM | FM_SMYCLM | FM_SCLM ;
 
 
@@ -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),(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);
+       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) ;
 }
 
 #if 0  /* Removed because the driver should use the ASICs TX complete IRQ. */