diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/net/tulip/de4x5.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
| -rw-r--r-- | drivers/net/tulip/de4x5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index c4ecb9a9540..09b57193a16 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
| @@ -450,7 +450,6 @@ | |||
| 450 | #include <linux/ptrace.h> | 450 | #include <linux/ptrace.h> |
| 451 | #include <linux/errno.h> | 451 | #include <linux/errno.h> |
| 452 | #include <linux/ioport.h> | 452 | #include <linux/ioport.h> |
| 453 | #include <linux/slab.h> | ||
| 454 | #include <linux/pci.h> | 453 | #include <linux/pci.h> |
| 455 | #include <linux/eisa.h> | 454 | #include <linux/eisa.h> |
| 456 | #include <linux/delay.h> | 455 | #include <linux/delay.h> |
| @@ -467,6 +466,7 @@ | |||
| 467 | #include <linux/dma-mapping.h> | 466 | #include <linux/dma-mapping.h> |
| 468 | #include <linux/moduleparam.h> | 467 | #include <linux/moduleparam.h> |
| 469 | #include <linux/bitops.h> | 468 | #include <linux/bitops.h> |
| 469 | #include <linux/gfp.h> | ||
| 470 | 470 | ||
| 471 | #include <asm/io.h> | 471 | #include <asm/io.h> |
| 472 | #include <asm/dma.h> | 472 | #include <asm/dma.h> |