git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
ixgb
/
ixgb_hw.h
diff --git
a/drivers/net/ixgb/ixgb_hw.h
b/drivers/net/ixgb/ixgb_hw.h
index
382c630
..
cb45689
100644
(file)
--- a/
drivers/net/ixgb/ixgb_hw.h
+++ b/
drivers/net/ixgb/ixgb_hw.h
@@
-1,7
+1,7
@@
/*******************************************************************************
/*******************************************************************************
- Copyright(c) 1999 - 200
5
Intel Corporation. All rights reserved.
+ Copyright(c) 1999 - 200
6
Intel Corporation. All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@
-57,6
+57,7
@@
typedef enum {
typedef enum {
ixgb_media_type_unknown = 0,
ixgb_media_type_fiber = 1,
typedef enum {
ixgb_media_type_unknown = 0,
ixgb_media_type_fiber = 1,
+ ixgb_media_type_copper = 2,
ixgb_num_media_types
} ixgb_media_type;
ixgb_num_media_types
} ixgb_media_type;