diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 09:22:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 09:22:01 +0100 |
| commit | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (patch) | |
| tree | 1d38f828b212adc0a0f2d100d58544979fab543d /drivers/net/dnet.c | |
| parent | ixgbe: Allow Priority Flow Control settings to survive a device reset (diff) | |
| parent | bridge: bad error handling when adding invalid ether address (diff) | |
| download | linux-f0de70f8bb56952f6e016a65a8a8d006918f5bf6.tar.xz linux-f0de70f8bb56952f6e016a65a8a8d006918f5bf6.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/dnet.c')
| -rw-r--r-- | drivers/net/dnet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index c05c2d69fbf6..db1e31f95200 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ #include <linux/version.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> |