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

Conflicts:
	net/bluetooth/l2cap_core.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 11c9ab3b1e1c..8befe697bd76 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -182,11 +182,11 @@ static int sl_alloc_bufs(struct slip *sl, int mtu)
 #ifdef SL_INCLUDE_CSLIP
         cbuff = xchg(&sl->cbuff, cbuff);
         slcomp = xchg(&sl->slcomp, slcomp);
+#endif
 #ifdef CONFIG_SLIP_MODE_SLIP6
         sl->xdata    = 0;
         sl->xbits    = 0;
 #endif
-#endif
         spin_unlock_bh(&sl->lock);
         err = 0;