diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-28 21:28:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-28 21:28:46 -0700 |
commit | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (patch) | |
tree | 7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3 /drivers/net/e1000e/e1000.h | |
parent | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (diff) | |
parent | be0976be9148f31ee0d1997354c3e30ff8d07587 (diff) | |
download | kernel-crypto-332e4af80d1214fbf0e263e1408fc7c5b64ecdd6.tar.gz kernel-crypto-332e4af80d1214fbf0e263e1408fc7c5b64ecdd6.tar.xz kernel-crypto-332e4af80d1214fbf0e263e1408fc7c5b64ecdd6.zip |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r-- | drivers/net/e1000e/e1000.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index d3bc6f8101f..4a4f62e002b 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -283,6 +283,10 @@ struct e1000_adapter { unsigned long led_status; unsigned int flags; + + /* for ioport free */ + int bars; + int need_ioport; }; struct e1000_info { |