From 9688f5eaa35e62ea066b9f7b0a42038e6554dd48 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 5 Sep 2010 09:00:23 +0000 Subject: [PATCH] --- yaml --- r: 214331 b: refs/heads/master c: a0ece28539d49c9bdcc6da0bbb26771dceb57581 h: refs/heads/master i: 214329: 89d835920756996c1094b8c63617140a23843e9e 214327: 903423efb83acd147065833fc34cb99b80dee761 v: v3 --- [refs] | 2 +- trunk/drivers/atm/firestream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 533c6a96653d..c16855a7998f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29af9309dba25077f711f5f975977714bc43a0c3 +refs/heads/master: a0ece28539d49c9bdcc6da0bbb26771dceb57581 diff --git a/trunk/drivers/atm/firestream.c b/trunk/drivers/atm/firestream.c index 8717809787fb..5d86bb803e94 100644 --- a/trunk/drivers/atm/firestream.c +++ b/trunk/drivers/atm/firestream.c @@ -444,8 +444,8 @@ static inline void fs_kfree_skb (struct sk_buff * skb) #define ROUND_NEAREST 3 /********** make rate (not quite as much fun as Horizon) **********/ -static unsigned int make_rate (unsigned int rate, int r, - u16 * bits, unsigned int * actual) +static int make_rate(unsigned int rate, int r, + u16 *bits, unsigned int *actual) { unsigned char exp = -1; /* hush gcc */ unsigned int man = -1; /* hush gcc */