diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-10-27 01:03:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 01:03:26 -0700 |
| commit | cfadf853f6cd9689f79a63ca960c6f9d6665314f (patch) | |
| tree | 35418e342d9783f0974ea33ef03875aa21d2362a /drivers/net/sh_eth.c | |
| parent | vlan: allow null VLAN ID to be used (diff) | |
| parent | sh_eth: Add asm/cacheflush.h (diff) | |
| download | wireguard-linux-cfadf853f6cd9689f79a63ca960c6f9d6665314f.tar.xz wireguard-linux-cfadf853f6cd9689f79a63ca960c6f9d6665314f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sh_eth.c
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 161181a4b3d6..5783f50d18e9 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -31,6 +31,8 @@ #include <linux/cache.h> #include <linux/io.h> #include <linux/pm_runtime.h> +#include <asm/cacheflush.h> + #include "sh_eth.h" /* There is CPU dependent code */ |