diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/net/tokenring | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/3c359.c | 1 | ||||
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 1 | ||||
| -rw-r--r-- | drivers/net/tokenring/madgemc.c | 1 | ||||
| -rw-r--r-- | drivers/net/tokenring/smctr.c | 1 | ||||
| -rw-r--r-- | drivers/net/tokenring/tms380tr.c | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 0fb930feea45..7d7f3eef1ab3 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | #include <linux/spinlock.h> | 63 | #include <linux/spinlock.h> |
| 64 | #include <linux/bitops.h> | 64 | #include <linux/bitops.h> |
| 65 | #include <linux/firmware.h> | 65 | #include <linux/firmware.h> |
| 66 | #include <linux/slab.h> | ||
| 66 | 67 | ||
| 67 | #include <net/checksum.h> | 68 | #include <net/checksum.h> |
| 68 | 69 | ||
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index dd028fee9dc2..7a5fbf5a9d71 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -121,6 +121,7 @@ | |||
| 121 | #include <linux/spinlock.h> | 121 | #include <linux/spinlock.h> |
| 122 | #include <linux/bitops.h> | 122 | #include <linux/bitops.h> |
| 123 | #include <linux/jiffies.h> | 123 | #include <linux/jiffies.h> |
| 124 | #include <linux/slab.h> | ||
| 124 | 125 | ||
| 125 | #include <net/net_namespace.h> | 126 | #include <net/net_namespace.h> |
| 126 | #include <net/checksum.h> | 127 | #include <net/checksum.h> |
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 456f8bff40be..53f631ebb162 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
| @@ -21,6 +21,7 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n"; | |||
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/mca.h> | 23 | #include <linux/mca.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 5401d86a7be4..e40560137c46 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/ptrace.h> | 36 | #include <linux/ptrace.h> |
| 37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 38 | #include <linux/in.h> | 38 | #include <linux/in.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 41 | #include <linux/time.h> | 40 | #include <linux/time.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index ee71bcfb3753..8b508c922410 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
| @@ -85,7 +85,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A | |||
| 85 | #include <linux/ptrace.h> | 85 | #include <linux/ptrace.h> |
| 86 | #include <linux/ioport.h> | 86 | #include <linux/ioport.h> |
| 87 | #include <linux/in.h> | 87 | #include <linux/in.h> |
| 88 | #include <linux/slab.h> | ||
| 89 | #include <linux/string.h> | 88 | #include <linux/string.h> |
| 90 | #include <linux/time.h> | 89 | #include <linux/time.h> |
| 91 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |