Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / skfp / smt.c

diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 2d9941c045bc152469f61acbf7db8762bbbc74b3..1e1bd0c201c8f1db898a95bf97adf44fae4cc944 100644 (file)
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1263,7 +1263,7 @@ void smt_set_timestamp(struct s_smc *smc, u_char *p)
 static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
 {
        int     i ;
-       u_char  *map ;
+       const u_char *map ;
        u_short in ;
        u_short out ;
 
@@ -1271,7 +1271,7 @@ static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
         * MIB para 101b (fddiSMTConnectionPolicy) coding
         * is different from 0005 coding
         */
-       static u_char   ansi_weirdness[16] = {
+       static const u_char ansi_weirdness[16] = {
                0,7,5,3,8,1,6,4,9,10,2,11,12,13,14,15
        } ;
        SMTSETPARA(policy,SMT_P_POLICY) ;