Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[sfrench/cifs-2.6.git] / drivers / net / slip.h

diff --git a/drivers/net/slip.h b/drivers/net/slip.h
index 29d87dd45a24ea3e77cc4b72503f66d7832667ac..853e0f6ec710f021df133da8199ba852733d2272 100644 (file)
--- a/drivers/net/slip.h
+++ b/drivers/net/slip.h
@@ -107,12 +107,12 @@ struct slip {
 #define SL_MODE_CSLIP6 (SL_MODE_SLIP6|SL_MODE_CSLIP)
 #define SL_MODE_AX25   4
 #define SL_MODE_ADAPTIVE 8
-#ifdef CONFIG_SLIP_SMART  
+#ifdef CONFIG_SLIP_SMART
   unsigned char                outfill;        /* # of sec between outfill packet */
   unsigned char                keepalive;      /* keepalive seconds            */
   struct timer_list    outfill_timer;
   struct timer_list    keepalive_timer;
-#endif  
+#endif
 };
 
 #define SLIP_MAGIC 0x5302