diff options
| author |   Simon Horman <horms@verge.net.au> | 2011-01-13 10:29:21 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-13 10:29:21 +0900 |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /drivers/net/ixgbevf/ixgbevf.h | |
| parent | netfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus (diff) | |
| download | linux-dev-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.xz linux-dev-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'drivers/net/ixgbevf/ixgbevf.h')
| -rw-r--r-- | drivers/net/ixgbevf/ixgbevf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ixgbevf/ixgbevf.h index da4033c6efa2..a63efcb2cf1b 100644 --- a/drivers/net/ixgbevf/ixgbevf.h +++ b/drivers/net/ixgbevf/ixgbevf.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel 82599 Virtual Function driver - Copyright(c) 1999 - 2009 Intel Corporation. + Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -275,9 +275,11 @@ enum ixbgevf_state_t { enum ixgbevf_boards { board_82599_vf, + board_X540_vf, }; -extern struct ixgbevf_info ixgbevf_vf_info; +extern struct ixgbevf_info ixgbevf_82599_vf_info; +extern struct ixgbevf_info ixgbevf_X540_vf_info; extern struct ixgbe_mac_operations ixgbevf_mbx_ops; /* needed by ethtool.c */ |