diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/appletalk/ltpc.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/appletalk/ltpc.c')
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 8ea4ec705bef..6af65b656f31 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
| @@ -215,7 +215,6 @@ static int dma; | |||
| 215 | #include <linux/ioport.h> | 215 | #include <linux/ioport.h> |
| 216 | #include <linux/spinlock.h> | 216 | #include <linux/spinlock.h> |
| 217 | #include <linux/in.h> | 217 | #include <linux/in.h> |
| 218 | #include <linux/slab.h> | ||
| 219 | #include <linux/string.h> | 218 | #include <linux/string.h> |
| 220 | #include <linux/errno.h> | 219 | #include <linux/errno.h> |
| 221 | #include <linux/init.h> | 220 | #include <linux/init.h> |
| @@ -228,6 +227,7 @@ static int dma; | |||
| 228 | #include <linux/timer.h> | 227 | #include <linux/timer.h> |
| 229 | #include <linux/atalk.h> | 228 | #include <linux/atalk.h> |
| 230 | #include <linux/bitops.h> | 229 | #include <linux/bitops.h> |
| 230 | #include <linux/gfp.h> | ||
| 231 | 231 | ||
| 232 | #include <asm/system.h> | 232 | #include <asm/system.h> |
| 233 | #include <asm/dma.h> | 233 | #include <asm/dma.h> |