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/au1000_eth.c | |
parent | vlan: allow null VLAN ID to be used (diff) | |
parent | sh_eth: Add asm/cacheflush.h (diff) | |
download | linux-dev-cfadf853f6cd9689f79a63ca960c6f9d6665314f.tar.xz linux-dev-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/au1000_eth.c')
-rw-r--r-- | drivers/net/au1000_eth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 04f63c77071d..ce6f1ac25df8 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -34,6 +34,7 @@ * * */ +#include <linux/capability.h> #include <linux/dma-mapping.h> #include <linux/module.h> #include <linux/kernel.h> |