diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/net/gianfar.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index ae5a2ed3b264..962580f2c4ab 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -81,7 +81,7 @@ | |||
| 81 | #include <linux/if_vlan.h> | 81 | #include <linux/if_vlan.h> |
| 82 | #include <linux/spinlock.h> | 82 | #include <linux/spinlock.h> |
| 83 | #include <linux/mm.h> | 83 | #include <linux/mm.h> |
| 84 | #include <linux/device.h> | 84 | #include <linux/platform_device.h> |
| 85 | #include <linux/ip.h> | 85 | #include <linux/ip.h> |
| 86 | #include <linux/tcp.h> | 86 | #include <linux/tcp.h> |
| 87 | #include <linux/udp.h> | 87 | #include <linux/udp.h> |