From 4b131a40ef11e7a4ec7f9538a00a93438cc38c10 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Aug 2004 11:27:20 +0000 Subject: more merge with kernel-2.6.8-0.rc2.2mdk --- lst/pcitable | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lst') diff --git a/lst/pcitable b/lst/pcitable index 63076ff9..a52d7b02 100644 --- a/lst/pcitable +++ b/lst/pcitable @@ -3797,6 +3797,7 @@ 0x1393 0x1040 "mxser" "Moxa Technologies Co Ltd|Smartio C104H/PCI" 0x1393 0x1041 "mxser" "Moxa Technologies Co Ltd| " 0x1393 0x1042 "unknown" "Moxa Technologies Co Ltd| " +0x1393 0x1140 "mxser" "" 0x1393 0x1141 "mxser" "Moxa Technologies Co Ltd|Industrio CP-114" 0x1393 0x1320 "mxser" "Moxa Technologies Co Ltd|CP-132 Industio" 0x1393 0x1321 "unknown" "Moxa Technologies Co Ltd| " @@ -4054,6 +4055,7 @@ 0x14e4 0x164d "tg3" "Broadcom Corporation|NetXtreme BCM5702FE Gigabit Ethernet" 0x14e4 0x1653 "tg3" "Broadcom Corporation|NetXtreme BCM5705 Gigabit Ethernet" 0x14e4 0x1654 "tg3" "Broadcom Corporation|NetXtreme BCM5705-2 Gigabit Ethernet" +0x14e4 0x1658 "tg3" "" 0x14e4 0x1659 "tg3" "Broadcom Corporation|NetXtreme BCM5721 Gigabit Ethernet PCI Express" 0x14e4 0x165d "tg3" "Broadcom Corporation|BCM5705M 1000BaseTX" 0x14e4 0x165e "tg3" "Broadcom Corporation|BCM5705M-2 1000BaseTX" @@ -5265,7 +5267,7 @@ 0x8086 0x2641 "unknown" "Intel Corp.|I/O Controller Hub LPC" 0x8086 0x2642 "unknown" "Intel Corp.|I/O Controller Hub LPC" 0x8086 0x2651 "ata_piix" "Intel Corp.|82801FB/FW (ICH6/ICH6W) SATA Controller" -0x8086 0x2652 "unknown" "Intel Corp.|82801FR/FRW (ICH6R/ICH6RW) SATA Controller" +0x8086 0x2652 "ata_piix" "Intel Corp.|82801FR/FRW (ICH6R/ICH6RW) SATA Controller" 0x8086 0x2653 "unknown" "Intel Corp.|82801FBM (ICH6M) SATA Controller" 0x8086 0x2658 "unknown" "Intel Corp.|I/O Controller Hub USB" 0x8086 0x2659 "unknown" "Intel Corp.|I/O Controller Hub USB" -- cgit v1.2.1