Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	sound/core/memalloc.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 6596cd0742b9..f972fef87c98 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -856,7 +856,7 @@ prepare_to_send( struct sk_buff  *skb,  struct net_device  *dev )
                 len = SBNI_MIN_LEN;
 
         nl->tx_buf_p    = skb;
-        nl->tx_frameno  = (len + nl->maxframe - 1) / nl->maxframe;
+        nl->tx_frameno  = DIV_ROUND_UP(len, nl->maxframe);
         nl->framelen    = len < nl->maxframe  ?  len  :  nl->maxframe;
 
         outb( inb( dev->base_addr + CSR0 ) | TR_REQ,  dev->base_addr + CSR0 );