diff options
author | Len Brown <len.brown@intel.com> | 2006-01-06 22:34:21 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-06 22:34:21 +0100 |
commit | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (patch) | |
tree | f9b3c1bfbc63fdb6a94e82177b8c3ae891125422 /drivers/net/plip.c | |
parent | [ACPI] linux-acpi@vger.kernel.org replaces acpi-devel@lists.sourceforge.net (diff) | |
parent | Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
download | linux-25da0974601fc8096461f3d3f7ca3aab8e79adfb.tar.xz linux-25da0974601fc8096461f3d3f7ca3aab8e79adfb.zip |
Auto-update from upstream
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" #include <linux/in.h> #include <linux/errno.h> #include <linux/delay.h> -#include <linux/lp.h> #include <linux/init.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> @@ -106,7 +105,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" #include <linux/skbuff.h> #include <linux/if_plip.h> #include <linux/workqueue.h> -#include <linux/ioport.h> #include <linux/spinlock.h> #include <linux/parport.h> #include <linux/bitops.h> |