Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index cbda3790a10d..3fa9f6171095 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -109,11 +109,10 @@ static void change_speed(struct IsdnCardState *cs, int baud)
 {
         int     quot = 0, baud_base;
         unsigned cval, fcr = 0;
-        int     bits;
 
 
         /* byte size and parity */
-        cval = 0x03; bits = 10;
+        cval = 0x03;
         /* Determine divisor based on baud rate */
         baud_base = BASE_BAUD;
         quot = baud_base / baud;