diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
| commit | cfadf853f6cd9689f79a63ca960c6f9d6665314f (patch) | |
| tree | 35418e342d9783f0974ea33ef03875aa21d2362a /drivers/net/au1000_eth.c | |
| parent | 05423b241311c9380b7280179295bac7794281b6 (diff) | |
| parent | f568a926a353d6816b3704d7367f34371df44ce7 (diff) | |
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 @@ | |||
| 34 | * | 34 | * |
| 35 | * | 35 | * |
| 36 | */ | 36 | */ |
| 37 | #include <linux/capability.h> | ||
| 37 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
| 38 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 39 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |