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 */