diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 22:30:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 22:30:17 -0700 |
| commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
| tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /drivers/net/ixgb/ixgb_ids.h | |
| parent | 83aa2e964b9b04effa304aaf3c1090b46812a04b (diff) | |
| parent | 67fbbe1551b24d1bcab8478407f9b8c713d5596e (diff) | |
| download | kernel_samsung_crespo-925068dcdc746236264d1877d3d5df656e87882a.zip kernel_samsung_crespo-925068dcdc746236264d1877d3d5df656e87882a.tar.gz kernel_samsung_crespo-925068dcdc746236264d1877d3d5df656e87882a.tar.bz2 | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ixgb/ixgb_ids.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb_ids.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h index 180d20e..2a58847 100644 --- a/drivers/net/ixgb/ixgb_ids.h +++ b/drivers/net/ixgb/ixgb_ids.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel PRO/10GbE Linux driver - Copyright(c) 1999 - 2006 Intel Corporation. + Copyright(c) 1999 - 2008 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, @@ -38,11 +38,11 @@ #define SUN_VENDOR_ID 0x108E #define SUN_SUBVENDOR_ID 0x108E -#define IXGB_DEVICE_ID_82597EX 0x1048 -#define IXGB_DEVICE_ID_82597EX_SR 0x1A48 +#define IXGB_DEVICE_ID_82597EX 0x1048 +#define IXGB_DEVICE_ID_82597EX_SR 0x1A48 #define IXGB_DEVICE_ID_82597EX_LR 0x1B48 -#define IXGB_SUBDEVICE_ID_A11F 0xA11F -#define IXGB_SUBDEVICE_ID_A01F 0xA01F +#define IXGB_SUBDEVICE_ID_A11F 0xA11F +#define IXGB_SUBDEVICE_ID_A01F 0xA01F #define IXGB_DEVICE_ID_82597EX_CX4 0x109E #define IXGB_SUBDEVICE_ID_A00C 0xA00C |