From 46999ce169209269f919ea6a69517214074030e8 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 26 Aug 2008 18:36:36 -0700 Subject: [PATCH] --- yaml --- r: 111377 b: refs/heads/master c: 2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf h: refs/heads/master i: 111375: fa1e12eacd028d7d55240811a5058b2a910969e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/hw.h | 1 + trunk/drivers/net/e1000e/ich8lan.c | 1 + trunk/drivers/net/e1000e/netdev.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9a126ecb49b6..e3dec6044da3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eeae6fd3f6a7f4cee0e75cf8b0d30b265339ae8 +refs/heads/master: 2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf diff --git a/trunk/drivers/net/e1000e/hw.h b/trunk/drivers/net/e1000e/hw.h index 74f263acb172..d0e7b461aaf7 100644 --- a/trunk/drivers/net/e1000e/hw.h +++ b/trunk/drivers/net/e1000e/hw.h @@ -346,6 +346,7 @@ enum e1e_registers { #define E1000_DEV_ID_ICH8_IFE_G 0x10C5 #define E1000_DEV_ID_ICH8_IGP_M 0x104D #define E1000_DEV_ID_ICH9_IGP_AMT 0x10BD +#define E1000_DEV_ID_ICH9_BM 0x10E5 #define E1000_DEV_ID_ICH9_IGP_M_AMT 0x10F5 #define E1000_DEV_ID_ICH9_IGP_M 0x10BF #define E1000_DEV_ID_ICH9_IGP_M_V 0x10CB diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c index 9e38452a738c..b5fc2c903044 100644 --- a/trunk/drivers/net/e1000e/ich8lan.c +++ b/trunk/drivers/net/e1000e/ich8lan.c @@ -44,6 +44,7 @@ * 82567LF-2 Gigabit Network Connection * 82567V-2 Gigabit Network Connection * 82562GT-3 10/100 Network Connection + * 82567LM-4 Gigabit Network Connection */ #include diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index d266510c8a94..c3d74115a6b9 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -4767,6 +4767,7 @@ static struct pci_device_id e1000_pci_tbl[] = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },