diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/slip.h | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
| download | kernel_samsung_espresso10-2dc94310bd94d0906febea7d0f7c188da620c952.zip kernel_samsung_espresso10-2dc94310bd94d0906febea7d0f7c188da620c952.tar.gz kernel_samsung_espresso10-2dc94310bd94d0906febea7d0f7c188da620c952.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/slip.h')
| -rw-r--r-- | drivers/net/slip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/slip.h b/drivers/net/slip.h index 29d87dd..853e0f6 100644 --- 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 |