diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:20:55 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:20:55 +1100 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/net/tokenring | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
| download | kernel_goldelico_gta04-de2d3dbd17e6bb60bde4632ce1c7df063b073934.zip kernel_goldelico_gta04-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.gz kernel_goldelico_gta04-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.bz2 | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/proteon.c | 1 | ||||
| -rw-r--r-- | drivers/net/tokenring/skisa.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c index eb1423e..d04c918 100644 --- a/drivers/net/tokenring/proteon.c +++ b/drivers/net/tokenring/proteon.c @@ -29,6 +29,7 @@ static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n #include <linux/init.h> #include <linux/netdevice.h> #include <linux/trdevice.h> +#include <linux/platform_device.h> #include <asm/system.h> #include <asm/io.h> diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c index 3c7c662..72cf708 100644 --- a/drivers/net/tokenring/skisa.c +++ b/drivers/net/tokenring/skisa.c @@ -36,6 +36,7 @@ static const char version[] = "skisa.c: v1.03 09/12/2002 by Jochen Friedrich\n"; #include <linux/init.h> #include <linux/netdevice.h> #include <linux/trdevice.h> +#include <linux/platform_device.h> #include <asm/system.h> #include <asm/io.h> |