diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /drivers/net/jazzsonic.c | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'drivers/net/jazzsonic.c')
| -rw-r--r-- | drivers/net/jazzsonic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 8423cb6875f0..a74a5cfaf5bc 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 34 | #include <linux/etherdevice.h> | 34 | #include <linux/etherdevice.h> |
| 35 | #include <linux/skbuff.h> | 35 | #include <linux/skbuff.h> |
| 36 | #include <linux/device.h> | 36 | #include <linux/platform_device.h> |
| 37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 38 | 38 | ||
| 39 | #include <asm/bootinfo.h> | 39 | #include <asm/bootinfo.h> |