Merge branch 'master' into for-davem

[~andy/linux] / drivers / atm / horizon.c

diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index b81210330aca90227945f14dd853d281085952f4..7d01c2a7525657f1da1654b4cf40ea04aec00b46 100644 (file)
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -43,7 +43,6 @@
 #include <linux/wait.h>
 #include <linux/slab.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <linux/atomic.h>
 #include <asm/uaccess.h>
@@ -2183,7 +2182,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
     default:
       PRINTD (DBG_QOS|DBG_VCC, "Bad AAL!");
       return -EINVAL;
-      break;
   }
   
   // TX traffic parameters
@@ -2358,7 +2356,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
       default: {
        PRINTD (DBG_QOS, "unsupported TX traffic class");
        return -EINVAL;
-       break;
       }
     }
   }
@@ -2434,7 +2431,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
       default: {
        PRINTD (DBG_QOS, "unsupported RX traffic class");
        return -EINVAL;
-       break;
       }
     }
   }
@@ -2582,7 +2578,6 @@ static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,
 //       break;
        default:
          return -ENOPROTOOPT;
-         break;
       };
       break;
   }
@@ -2602,7 +2597,6 @@ static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,
 //       break;
        default:
          return -ENOPROTOOPT;
-         break;
       };
       break;
   }