diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/net/slip.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/slip.c')
| -rw-r--r-- | drivers/net/slip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 16363b5c6f56..404ea4297e32 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <linux/rtnetlink.h> | 74 | #include <linux/rtnetlink.h> |
| 75 | #include <linux/if_arp.h> | 75 | #include <linux/if_arp.h> |
| 76 | #include <linux/if_slip.h> | 76 | #include <linux/if_slip.h> |
| 77 | #include <linux/delay.h> | ||
| 77 | #include <linux/init.h> | 78 | #include <linux/init.h> |
| 78 | #include "slip.h" | 79 | #include "slip.h" |
| 79 | #ifdef CONFIG_INET | 80 | #ifdef CONFIG_INET |