diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /drivers/net/plip.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/net/plip.c')
| -rw-r--r-- | drivers/net/plip.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 1bd22cd40c75..87ee3271b17d 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
| @@ -98,7 +98,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" | |||
| 98 | #include <linux/in.h> | 98 | #include <linux/in.h> |
| 99 | #include <linux/errno.h> | 99 | #include <linux/errno.h> |
| 100 | #include <linux/delay.h> | 100 | #include <linux/delay.h> |
| 101 | #include <linux/lp.h> | ||
| 102 | #include <linux/init.h> | 101 | #include <linux/init.h> |
| 103 | #include <linux/netdevice.h> | 102 | #include <linux/netdevice.h> |
| 104 | #include <linux/etherdevice.h> | 103 | #include <linux/etherdevice.h> |
| @@ -106,7 +105,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" | |||
| 106 | #include <linux/skbuff.h> | 105 | #include <linux/skbuff.h> |
| 107 | #include <linux/if_plip.h> | 106 | #include <linux/if_plip.h> |
| 108 | #include <linux/workqueue.h> | 107 | #include <linux/workqueue.h> |
| 109 | #include <linux/ioport.h> | ||
| 110 | #include <linux/spinlock.h> | 108 | #include <linux/spinlock.h> |
| 111 | #include <linux/parport.h> | 109 | #include <linux/parport.h> |
| 112 | #include <linux/bitops.h> | 110 | #include <linux/bitops.h> |