diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-07 04:39:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-07 04:39:31 +0200 |
| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 (patch) | |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 /drivers/net/ll_temac_main.c | |
| parent | bonding: add Speed/Duplex information to /proc/net/bonding/bond (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | linux-69259abb64d4da77273bf59accfc9fa79e7165f4.tar.xz linux-69259abb64d4da77273bf59accfc9fa79e7165f4.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
Diffstat (limited to 'drivers/net/ll_temac_main.c')
| -rw-r--r-- | drivers/net/ll_temac_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 8762dcb84e8b..9f8e7027b0b3 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -38,6 +38,7 @@ #include <linux/of_device.h> #include <linux/of_mdio.h> #include <linux/of_platform.h> +#include <linux/of_address.h> #include <linux/skbuff.h> #include <linux/spinlock.h> #include <linux/tcp.h> /* needed for sizeof(tcphdr) */ |