git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_82598.c
diff --git
a/drivers/net/ixgbe/ixgbe_82598.c
b/drivers/net/ixgbe/ixgbe_82598.c
index
522c03b
..
1c227b0
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_82598.c
+++ b/
drivers/net/ixgbe/ixgbe_82598.c
@@
-334,6
+334,7
@@
static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
media_type = ixgbe_media_type_fiber;
break;
case IXGBE_DEV_ID_82598AT:
+ case IXGBE_DEV_ID_82598AT2:
media_type = ixgbe_media_type_copper;
break;
default: