Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/net/skfp/cfm.c b/drivers/net/skfp/cfm.c
index 4c8aaa7..5310d39 100644 (file)
--- a/drivers/net/skfp/cfm.c
+++ b/drivers/net/skfp/cfm.c
@@ -73,7 +73,7 @@ static const char * const cfm_events[] = {
 /*
  * map from state to downstream port type
  */
-static const u_char cf_to_ptype[] = {
+static const unsigned char cf_to_ptype[] = {
        TNONE,TNONE,TNONE,TNONE,TNONE,
        TNONE,TB,TB,TS,
        TA,TB,TS,TB