diff --git a/chipset_enable.c b/chipset_enable.c
index 8be6dea..40761d2 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -1366,60 +1366,60 @@
 /* Please keep this list numerically sorted by vendor/device ID. */
 const struct penable chipset_enables[] = {
 #if defined(__i386__) || defined(__x86_64__)
-	{0x1002, 0x4377, OK, "ATI", "SB400",		enable_flash_sb400},
-	{0x1002, 0x438d, OK, "AMD", "SB600",		enable_flash_sb600},
-	{0x1002, 0x439d, OK, "AMD", "SB7x0/SB8x0/SB9x0", enable_flash_sb600},
-	{0x100b, 0x0510, NT, "AMD", "SC1100",		enable_flash_sc1100},
-	{0x1022, 0x2080, OK, "AMD", "CS5536",		enable_flash_cs5536},
-	{0x1022, 0x2090, OK, "AMD", "CS5536",		enable_flash_cs5536},
-	{0x1022, 0x3000, OK, "AMD", "Elan SC520",	get_flashbase_sc520},
-	{0x1022, 0x7440, OK, "AMD", "AMD-768",		enable_flash_amd_768_8111},
-	{0x1022, 0x7468, OK, "AMD", "AMD-8111",		enable_flash_amd_768_8111},
-	{0x1022, 0x780e, OK, "AMD", "FCH",		enable_flash_sb600},
-	{0x1039, 0x0406, NT, "SiS", "501/5101/5501",	enable_flash_sis501},
-	{0x1039, 0x0496, NT, "SiS", "85C496+497",	enable_flash_sis85c496},
-	{0x1039, 0x0530, OK, "SiS", "530",		enable_flash_sis530},
-	{0x1039, 0x0540, NT, "SiS", "540",		enable_flash_sis540},
-	{0x1039, 0x0620, NT, "SiS", "620",		enable_flash_sis530},
-	{0x1039, 0x0630, NT, "SiS", "630",		enable_flash_sis540},
-	{0x1039, 0x0635, NT, "SiS", "635",		enable_flash_sis540},
-	{0x1039, 0x0640, NT, "SiS", "640",		enable_flash_sis540},
-	{0x1039, 0x0645, NT, "SiS", "645",		enable_flash_sis540},
-	{0x1039, 0x0646, OK, "SiS", "645DX",		enable_flash_sis540},
-	{0x1039, 0x0648, OK, "SiS", "648",		enable_flash_sis540},
-	{0x1039, 0x0650, OK, "SiS", "650",		enable_flash_sis540},
-	{0x1039, 0x0651, OK, "SiS", "651",		enable_flash_sis540},
-	{0x1039, 0x0655, NT, "SiS", "655",		enable_flash_sis540},
-	{0x1039, 0x0661, OK, "SiS", "661",		enable_flash_sis540},
-	{0x1039, 0x0730, OK, "SiS", "730",		enable_flash_sis540},
-	{0x1039, 0x0733, NT, "SiS", "733",		enable_flash_sis540},
-	{0x1039, 0x0735, OK, "SiS", "735",		enable_flash_sis540},
-	{0x1039, 0x0740, NT, "SiS", "740",		enable_flash_sis540},
-	{0x1039, 0x0741, OK, "SiS", "741",		enable_flash_sis540},
-	{0x1039, 0x0745, OK, "SiS", "745",		enable_flash_sis540},
-	{0x1039, 0x0746, NT, "SiS", "746",		enable_flash_sis540},
-	{0x1039, 0x0748, NT, "SiS", "748",		enable_flash_sis540},
-	{0x1039, 0x0755, OK, "SiS", "755",		enable_flash_sis540},
-	{0x1039, 0x5511, NT, "SiS", "5511",		enable_flash_sis5511},
-	{0x1039, 0x5571, NT, "SiS", "5571",		enable_flash_sis530},
-	{0x1039, 0x5591, NT, "SiS", "5591/5592",	enable_flash_sis530},
-	{0x1039, 0x5596, NT, "SiS", "5596",		enable_flash_sis5511},
-	{0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530},
-	{0x1039, 0x5600, NT, "SiS", "600",		enable_flash_sis530},
-	{0x1078, 0x0100, OK, "AMD", "CS5530(A)",	enable_flash_cs5530},
-	{0x10b9, 0x1533, OK, "ALi", "M1533",		enable_flash_ali_m1533},
-	{0x10de, 0x0030, OK, "NVIDIA", "nForce4/MCP4",	enable_flash_nvidia_nforce2},
-	{0x10de, 0x0050, OK, "NVIDIA", "CK804",		enable_flash_ck804}, /* LPC */
-	{0x10de, 0x0051, OK, "NVIDIA", "CK804",		enable_flash_ck804}, /* Pro */
-	{0x10de, 0x0060, OK, "NVIDIA", "NForce2",	enable_flash_nvidia_nforce2},
-	{0x10de, 0x00e0, OK, "NVIDIA", "NForce3",	enable_flash_nvidia_nforce2},
+	{0x1002, 0x4377, OK,  "ATI", "SB400",				enable_flash_sb400},
+	{0x1002, 0x438d, OK,  "AMD", "SB600",				enable_flash_sb600},
+	{0x1002, 0x439d, OK,  "AMD", "SB7x0/SB8x0/SB9x0",		enable_flash_sb600},
+	{0x100b, 0x0510, NT,  "AMD", "SC1100",				enable_flash_sc1100},
+	{0x1022, 0x2080, OK,  "AMD", "CS5536",				enable_flash_cs5536},
+	{0x1022, 0x2090, OK,  "AMD", "CS5536",				enable_flash_cs5536},
+	{0x1022, 0x3000, OK,  "AMD", "Elan SC520",			get_flashbase_sc520},
+	{0x1022, 0x7440, OK,  "AMD", "AMD-768",				enable_flash_amd_768_8111},
+	{0x1022, 0x7468, OK,  "AMD", "AMD-8111",			enable_flash_amd_768_8111},
+	{0x1022, 0x780e, OK,  "AMD", "FCH",				enable_flash_sb600},
+	{0x1039, 0x0406, NT,  "SiS", "501/5101/5501",			enable_flash_sis501},
+	{0x1039, 0x0496, NT,  "SiS", "85C496+497",			enable_flash_sis85c496},
+	{0x1039, 0x0530, OK,  "SiS", "530",				enable_flash_sis530},
+	{0x1039, 0x0540, NT,  "SiS", "540",				enable_flash_sis540},
+	{0x1039, 0x0620, NT,  "SiS", "620",				enable_flash_sis530},
+	{0x1039, 0x0630, NT,  "SiS", "630",				enable_flash_sis540},
+	{0x1039, 0x0635, NT,  "SiS", "635",				enable_flash_sis540},
+	{0x1039, 0x0640, NT,  "SiS", "640",				enable_flash_sis540},
+	{0x1039, 0x0645, NT,  "SiS", "645",				enable_flash_sis540},
+	{0x1039, 0x0646, OK,  "SiS", "645DX",				enable_flash_sis540},
+	{0x1039, 0x0648, OK,  "SiS", "648",				enable_flash_sis540},
+	{0x1039, 0x0650, OK,  "SiS", "650",				enable_flash_sis540},
+	{0x1039, 0x0651, OK,  "SiS", "651",				enable_flash_sis540},
+	{0x1039, 0x0655, NT,  "SiS", "655",				enable_flash_sis540},
+	{0x1039, 0x0661, OK,  "SiS", "661",				enable_flash_sis540},
+	{0x1039, 0x0730, OK,  "SiS", "730",				enable_flash_sis540},
+	{0x1039, 0x0733, NT,  "SiS", "733",				enable_flash_sis540},
+	{0x1039, 0x0735, OK,  "SiS", "735",				enable_flash_sis540},
+	{0x1039, 0x0740, NT,  "SiS", "740",				enable_flash_sis540},
+	{0x1039, 0x0741, OK,  "SiS", "741",				enable_flash_sis540},
+	{0x1039, 0x0745, OK,  "SiS", "745",				enable_flash_sis540},
+	{0x1039, 0x0746, NT,  "SiS", "746",				enable_flash_sis540},
+	{0x1039, 0x0748, NT,  "SiS", "748",				enable_flash_sis540},
+	{0x1039, 0x0755, OK,  "SiS", "755",				enable_flash_sis540},
+	{0x1039, 0x5511, NT,  "SiS", "5511",				enable_flash_sis5511},
+	{0x1039, 0x5571, NT,  "SiS", "5571",				enable_flash_sis530},
+	{0x1039, 0x5591, NT,  "SiS", "5591/5592",			enable_flash_sis530},
+	{0x1039, 0x5596, NT,  "SiS", "5596",				enable_flash_sis5511},
+	{0x1039, 0x5597, NT,  "SiS", "5597/5598/5581/5120",		enable_flash_sis530},
+	{0x1039, 0x5600, NT,  "SiS", "600",				enable_flash_sis530},
+	{0x1078, 0x0100, OK,  "AMD", "CS5530(A)",			enable_flash_cs5530},
+	{0x10b9, 0x1533, OK,  "ALi", "M1533",				enable_flash_ali_m1533},
+	{0x10de, 0x0030, OK,  "NVIDIA", "nForce4/MCP4",			enable_flash_nvidia_nforce2},
+	{0x10de, 0x0050, OK,  "NVIDIA", "CK804",			enable_flash_ck804}, /* LPC */
+	{0x10de, 0x0051, OK,  "NVIDIA", "CK804",			enable_flash_ck804}, /* Pro */
+	{0x10de, 0x0060, OK,  "NVIDIA", "NForce2",			enable_flash_nvidia_nforce2},
+	{0x10de, 0x00e0, OK,  "NVIDIA", "NForce3",			enable_flash_nvidia_nforce2},
 	/* Slave, should not be here, to fix known bug for A01. */
-	{0x10de, 0x00d3, OK, "NVIDIA", "CK804",		enable_flash_ck804},
-	{0x10de, 0x0260, OK, "NVIDIA", "MCP51",		enable_flash_ck804},
-	{0x10de, 0x0261, OK, "NVIDIA", "MCP51",		enable_flash_ck804},
-	{0x10de, 0x0262, NT, "NVIDIA", "MCP51",		enable_flash_ck804},
-	{0x10de, 0x0263, NT, "NVIDIA", "MCP51",		enable_flash_ck804},
-	{0x10de, 0x0360, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* M57SLI*/
+	{0x10de, 0x00d3, OK,  "NVIDIA", "CK804",			enable_flash_ck804},
+	{0x10de, 0x0260, OK,  "NVIDIA", "MCP51",			enable_flash_ck804},
+	{0x10de, 0x0261, OK,  "NVIDIA", "MCP51",			enable_flash_ck804},
+	{0x10de, 0x0262, NT,  "NVIDIA", "MCP51",			enable_flash_ck804},
+	{0x10de, 0x0263, NT,  "NVIDIA", "MCP51",			enable_flash_ck804},
+	{0x10de, 0x0360, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* M57SLI*/
 	/* 10de:0361 is present in Tyan S2915 OEM systems, but not connected to
 	 * the flash chip. Instead, 10de:0364 is connected to the flash chip.
 	 * Until we have PCI device class matching or some fallback mechanism,
@@ -1427,221 +1427,221 @@
 	 * dual-MCP55 boards.
 	 */
 #if 0
-	{0x10de, 0x0361, NT, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0361, NT,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
 #endif
-	{0x10de, 0x0362, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
-	{0x10de, 0x0363, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
-	{0x10de, 0x0364, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
-	{0x10de, 0x0365, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
-	{0x10de, 0x0366, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* LPC */
-	{0x10de, 0x0367, OK, "NVIDIA", "MCP55",		enable_flash_mcp55}, /* Pro */
-	{0x10de, 0x03e0, OK, "NVIDIA", "MCP61",		enable_flash_mcp6x_7x},
-	{0x10de, 0x03e1, OK, "NVIDIA", "MCP61",		enable_flash_mcp6x_7x},
-	{0x10de, 0x03e3, NT, "NVIDIA", "MCP61",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0440, NT, "NVIDIA", "MCP65",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0441, NT, "NVIDIA", "MCP65",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0442, NT, "NVIDIA", "MCP65",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0443, NT, "NVIDIA", "MCP65",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0548, OK, "NVIDIA", "MCP67",		enable_flash_mcp6x_7x},
-	{0x10de, 0x075c, OK, "NVIDIA", "MCP78S",	enable_flash_mcp6x_7x},
-	{0x10de, 0x075d, OK, "NVIDIA", "MCP78S",	enable_flash_mcp6x_7x},
-	{0x10de, 0x07d7, OK, "NVIDIA", "MCP73",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0aac, OK, "NVIDIA", "MCP79",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0aad, NT, "NVIDIA", "MCP79",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0aae, NT, "NVIDIA", "MCP79",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0aaf, NT, "NVIDIA", "MCP79",		enable_flash_mcp6x_7x},
-	{0x10de, 0x0d80, NT, "NVIDIA", "MCP89",		enable_flash_mcp6x_7x},
+	{0x10de, 0x0362, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0363, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0364, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0365, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0366, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* LPC */
+	{0x10de, 0x0367, OK,  "NVIDIA", "MCP55",			enable_flash_mcp55}, /* Pro */
+	{0x10de, 0x03e0, OK,  "NVIDIA", "MCP61",			enable_flash_mcp6x_7x},
+	{0x10de, 0x03e1, OK,  "NVIDIA", "MCP61",			enable_flash_mcp6x_7x},
+	{0x10de, 0x03e3, NT,  "NVIDIA", "MCP61",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0440, NT,  "NVIDIA", "MCP65",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0441, NT,  "NVIDIA", "MCP65",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0442, NT,  "NVIDIA", "MCP65",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0443, NT,  "NVIDIA", "MCP65",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0548, OK,  "NVIDIA", "MCP67",			enable_flash_mcp6x_7x},
+	{0x10de, 0x075c, OK,  "NVIDIA", "MCP78S",			enable_flash_mcp6x_7x},
+	{0x10de, 0x075d, OK,  "NVIDIA", "MCP78S",			enable_flash_mcp6x_7x},
+	{0x10de, 0x07d7, OK,  "NVIDIA", "MCP73",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0aac, OK,  "NVIDIA", "MCP79",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0aad, NT,  "NVIDIA", "MCP79",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0aae, NT,  "NVIDIA", "MCP79",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0aaf, NT,  "NVIDIA", "MCP79",			enable_flash_mcp6x_7x},
+	{0x10de, 0x0d80, NT,  "NVIDIA", "MCP89",			enable_flash_mcp6x_7x},
 	/* VIA northbridges */
-	{0x1106, 0x0585, NT, "VIA", "VT82C585VPX",	via_no_byte_merge},
-	{0x1106, 0x0595, NT, "VIA", "VT82C595",		via_no_byte_merge},
-	{0x1106, 0x0597, NT, "VIA", "VT82C597",		via_no_byte_merge},
-	{0x1106, 0x0601, NT, "VIA", "VT8601/VT8601A",	via_no_byte_merge},
-	{0x1106, 0x0691, OK, "VIA", "VT82C69x",		via_no_byte_merge},
-	{0x1106, 0x8601, NT, "VIA", "VT8601T",		via_no_byte_merge},
+	{0x1106, 0x0585, NT,  "VIA", "VT82C585VPX",			via_no_byte_merge},
+	{0x1106, 0x0595, NT,  "VIA", "VT82C595",			via_no_byte_merge},
+	{0x1106, 0x0597, NT,  "VIA", "VT82C597",			via_no_byte_merge},
+	{0x1106, 0x0601, NT,  "VIA", "VT8601/VT8601A",			via_no_byte_merge},
+	{0x1106, 0x0691, OK,  "VIA", "VT82C69x",			via_no_byte_merge},
+	{0x1106, 0x8601, NT,  "VIA", "VT8601T",				via_no_byte_merge},
 	/* VIA southbridges */
-	{0x1106, 0x0586, OK, "VIA", "VT82C586A/B",	enable_flash_vt82c586},
-	{0x1106, 0x0596, OK, "VIA", "VT82C596",		enable_flash_vt82c596},
-	{0x1106, 0x0686, OK, "VIA", "VT82C686A/B",	enable_flash_vt82c596},
-	{0x1106, 0x3074, OK, "VIA", "VT8233",		enable_flash_vt823x},
-	{0x1106, 0x3147, OK, "VIA", "VT8233A",		enable_flash_vt823x},
-	{0x1106, 0x3177, OK, "VIA", "VT8235",		enable_flash_vt823x},
-	{0x1106, 0x3227, OK, "VIA", "VT8237(R)",	enable_flash_vt823x},
-	{0x1106, 0x3337, OK, "VIA", "VT8237A",		enable_flash_vt823x},
-	{0x1106, 0x3372, OK, "VIA", "VT8237S",		enable_flash_vt8237s_spi},
-	{0x1106, 0x8231, NT, "VIA", "VT8231",		enable_flash_vt823x},
-	{0x1106, 0x8324, OK, "VIA", "CX700",		enable_flash_vt823x},
-	{0x1106, 0x8353, NT, "VIA", "VX800/VX820",	enable_flash_vt_vx},
-	{0x1106, 0x8409, NT, "VIA", "VX855/VX875",	enable_flash_vt_vx},
-	{0x1106, 0x8410, NT, "VIA", "VX900",		enable_flash_vt_vx},
-	{0x1166, 0x0200, OK, "Broadcom", "OSB4",	enable_flash_osb4},
-	{0x1166, 0x0205, OK, "Broadcom", "HT-1000",	enable_flash_ht1000},
-	{0x17f3, 0x6030, OK, "RDC", "R8610/R3210",	enable_flash_rdc_r8610},
-	{0x8086, 0x0c60, NT, "Intel", "S12x0",		enable_flash_s12x0},
-	{0x8086, 0x122e, OK, "Intel", "PIIX",		enable_flash_piix4},
-	{0x8086, 0x1234, NT, "Intel", "MPIIX",		enable_flash_piix4},
-	{0x8086, 0x1c44, OK, "Intel", "Z68",		enable_flash_pch6},
-	{0x8086, 0x1c46, OK, "Intel", "P67",		enable_flash_pch6},
-	{0x8086, 0x1c47, NT, "Intel", "UM67",		enable_flash_pch6},
-	{0x8086, 0x1c49, NT, "Intel", "HM65",		enable_flash_pch6},
-	{0x8086, 0x1c4a, OK, "Intel", "H67",		enable_flash_pch6},
-	{0x8086, 0x1c4b, NT, "Intel", "HM67",		enable_flash_pch6},
-	{0x8086, 0x1c4c, NT, "Intel", "Q65",		enable_flash_pch6},
-	{0x8086, 0x1c4d, NT, "Intel", "QS67",		enable_flash_pch6},
-	{0x8086, 0x1c4e, NT, "Intel", "Q67",		enable_flash_pch6},
-	{0x8086, 0x1c4f, OK, "Intel", "QM67",		enable_flash_pch6},
-	{0x8086, 0x1c50, NT, "Intel", "B65",		enable_flash_pch6},
-	{0x8086, 0x1c52, NT, "Intel", "C202",		enable_flash_pch6},
-	{0x8086, 0x1c54, OK, "Intel", "C204",		enable_flash_pch6},
-	{0x8086, 0x1c56, NT, "Intel", "C206",		enable_flash_pch6},
-	{0x8086, 0x1c5c, OK, "Intel", "H61",		enable_flash_pch6},
-	{0x8086, 0x1d40, OK, "Intel", "C60x/X79",	enable_flash_pch6},
-	{0x8086, 0x1d41, OK, "Intel", "C60x/X79",	enable_flash_pch6},
-	{0x8086, 0x1e44, OK, "Intel", "Z77",		enable_flash_pch7},
-	{0x8086, 0x1e46, NT, "Intel", "Z75",		enable_flash_pch7},
-	{0x8086, 0x1e47, NT, "Intel", "Q77",		enable_flash_pch7},
-	{0x8086, 0x1e48, NT, "Intel", "Q75",		enable_flash_pch7},
-	{0x8086, 0x1e49, OK, "Intel", "B75",		enable_flash_pch7},
-	{0x8086, 0x1e4a, OK, "Intel", "H77",		enable_flash_pch7},
-	{0x8086, 0x1e53, NT, "Intel", "C216",		enable_flash_pch7},
-	{0x8086, 0x1e55, OK, "Intel", "QM77",		enable_flash_pch7},
-	{0x8086, 0x1e56, NT, "Intel", "QS77",		enable_flash_pch7},
-	{0x8086, 0x1e57, OK, "Intel", "HM77",		enable_flash_pch7},
-	{0x8086, 0x1e58, NT, "Intel", "UM77",		enable_flash_pch7},
-	{0x8086, 0x1e59, NT, "Intel", "HM76",		enable_flash_pch7},
-	{0x8086, 0x1e5d, NT, "Intel", "HM75",		enable_flash_pch7},
-	{0x8086, 0x1e5e, NT, "Intel", "HM70",		enable_flash_pch7},
-	{0x8086, 0x1e5f, OK, "Intel", "NM70",		enable_flash_pch7},
-	{0x8086, 0x2310, NT, "Intel", "DH89xxCC",	enable_flash_pch7},
-	{0x8086, 0x2390, NT, "Intel", "Coleto Creek",	enable_flash_pch7},
-	{0x8086, 0x2410, OK, "Intel", "ICH",		enable_flash_ich0},
-	{0x8086, 0x2420, OK, "Intel", "ICH0",		enable_flash_ich0},
-	{0x8086, 0x2440, OK, "Intel", "ICH2",		enable_flash_ich2345},
-	{0x8086, 0x244c, OK, "Intel", "ICH2-M",		enable_flash_ich2345},
-	{0x8086, 0x2450, NT, "Intel", "C-ICH",		enable_flash_ich2345},
-	{0x8086, 0x2480, OK, "Intel", "ICH3-S",		enable_flash_ich2345},
-	{0x8086, 0x248c, OK, "Intel", "ICH3-M",		enable_flash_ich2345},
-	{0x8086, 0x24c0, OK, "Intel", "ICH4/ICH4-L",	enable_flash_ich2345},
-	{0x8086, 0x24cc, OK, "Intel", "ICH4-M",		enable_flash_ich2345},
-	{0x8086, 0x24d0, OK, "Intel", "ICH5/ICH5R",	enable_flash_ich2345},
-	{0x8086, 0x25a1, OK, "Intel", "6300ESB",	enable_flash_ich2345},
-	{0x8086, 0x2640, OK, "Intel", "ICH6/ICH6R",	enable_flash_ich6},
-	{0x8086, 0x2641, OK, "Intel", "ICH6-M",		enable_flash_ich6},
-	{0x8086, 0x2642, NT, "Intel", "ICH6W/ICH6RW",	enable_flash_ich6},
-	{0x8086, 0x2670, OK, "Intel", "631xESB/632xESB/3100", enable_flash_ich6},
-	{0x8086, 0x27b0, OK, "Intel", "ICH7DH",		enable_flash_ich7},
-	{0x8086, 0x27b8, OK, "Intel", "ICH7/ICH7R",	enable_flash_ich7},
-	{0x8086, 0x27b9, OK, "Intel", "ICH7M",		enable_flash_ich7},
-	{0x8086, 0x27bc, OK, "Intel", "NM10",		enable_flash_ich7},
-	{0x8086, 0x27bd, OK, "Intel", "ICH7MDH",	enable_flash_ich7},
-	{0x8086, 0x2810, OK, "Intel", "ICH8/ICH8R",	enable_flash_ich8},
-	{0x8086, 0x2811, OK, "Intel", "ICH8M-E",	enable_flash_ich8},
-	{0x8086, 0x2812, OK, "Intel", "ICH8DH",		enable_flash_ich8},
-	{0x8086, 0x2814, OK, "Intel", "ICH8DO",		enable_flash_ich8},
-	{0x8086, 0x2815, OK, "Intel", "ICH8M",		enable_flash_ich8},
-	{0x8086, 0x2910, OK, "Intel", "ICH9 Engineering Sample", enable_flash_ich9},
-	{0x8086, 0x2912, OK, "Intel", "ICH9DH",		enable_flash_ich9},
-	{0x8086, 0x2914, OK, "Intel", "ICH9DO",		enable_flash_ich9},
-	{0x8086, 0x2916, OK, "Intel", "ICH9R",		enable_flash_ich9},
-	{0x8086, 0x2917, OK, "Intel", "ICH9M-E",	enable_flash_ich9},
-	{0x8086, 0x2918, OK, "Intel", "ICH9",		enable_flash_ich9},
-	{0x8086, 0x2919, OK, "Intel", "ICH9M",		enable_flash_ich9},
-	{0x8086, 0x3a10, NT, "Intel", "ICH10R Engineering Sample", enable_flash_ich10},
-	{0x8086, 0x3a14, OK, "Intel", "ICH10DO",	enable_flash_ich10},
-	{0x8086, 0x3a16, OK, "Intel", "ICH10R",		enable_flash_ich10},
-	{0x8086, 0x3a18, OK, "Intel", "ICH10",		enable_flash_ich10},
-	{0x8086, 0x3a1a, OK, "Intel", "ICH10D",		enable_flash_ich10},
-	{0x8086, 0x3a1e, NT, "Intel", "ICH10 Engineering Sample", enable_flash_ich10},
-	{0x8086, 0x3b00, NT, "Intel", "3400 Desktop",	enable_flash_pch5},
-	{0x8086, 0x3b01, NT, "Intel", "3400 Mobile",	enable_flash_pch5},
-	{0x8086, 0x3b02, NT, "Intel", "P55",		enable_flash_pch5},
-	{0x8086, 0x3b03, NT, "Intel", "PM55",		enable_flash_pch5},
-	{0x8086, 0x3b06, OK, "Intel", "H55",		enable_flash_pch5},
-	{0x8086, 0x3b07, OK, "Intel", "QM57",		enable_flash_pch5},
-	{0x8086, 0x3b08, NT, "Intel", "H57",		enable_flash_pch5},
-	{0x8086, 0x3b09, NT, "Intel", "HM55",		enable_flash_pch5},
-	{0x8086, 0x3b0a, NT, "Intel", "Q57",		enable_flash_pch5},
-	{0x8086, 0x3b0b, NT, "Intel", "HM57",		enable_flash_pch5},
-	{0x8086, 0x3b0d, NT, "Intel", "3400 Mobile SFF", enable_flash_pch5},
-	{0x8086, 0x3b0e, NT, "Intel", "B55",		enable_flash_pch5},
-	{0x8086, 0x3b0f, OK, "Intel", "QS57",		enable_flash_pch5},
-	{0x8086, 0x3b12, NT, "Intel", "3400",		enable_flash_pch5},
-	{0x8086, 0x3b14, OK, "Intel", "3420",		enable_flash_pch5},
-	{0x8086, 0x3b16, NT, "Intel", "3450",		enable_flash_pch5},
-	{0x8086, 0x3b1e, NT, "Intel", "B55",		enable_flash_pch5},
-	{0x8086, 0x5031, OK, "Intel", "EP80579",	enable_flash_ich7},
-	{0x8086, 0x7000, OK, "Intel", "PIIX3",		enable_flash_piix4},
-	{0x8086, 0x7110, OK, "Intel", "PIIX4/4E/4M",	enable_flash_piix4},
-	{0x8086, 0x7198, OK, "Intel", "440MX",		enable_flash_piix4},
-	{0x8086, 0x8119, OK, "Intel", "SCH Poulsbo",	enable_flash_poulsbo},
-	{0x8086, 0x8186, OK, "Intel", "Atom E6xx(T)/Tunnel Creek", enable_flash_tunnelcreek},
-	{0x8086, 0x8c40, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c41, NT, "Intel", "Lynx Point Mobile Engineering Sample", enable_flash_pch8},
-	{0x8086, 0x8c42, NT, "Intel", "Lynx Point Desktop Engineering Sample", enable_flash_pch8},
-	{0x8086, 0x8c43, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c44, OK, "Intel", "Z87",		enable_flash_pch8},
-	{0x8086, 0x8c45, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c46, NT, "Intel", "Z85",		enable_flash_pch8},
-	{0x8086, 0x8c47, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c48, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c49, NT, "Intel", "HM86",		enable_flash_pch8},
-	{0x8086, 0x8c4a, OK, "Intel", "H87",		enable_flash_pch8},
-	{0x8086, 0x8c4b, OK, "Intel", "HM87",		enable_flash_pch8},
-	{0x8086, 0x8c4c, NT, "Intel", "Q85",		enable_flash_pch8},
-	{0x8086, 0x8c4d, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c4e, NT, "Intel", "Q87",		enable_flash_pch8},
-	{0x8086, 0x8c4f, NT, "Intel", "QM87",		enable_flash_pch8},
-	{0x8086, 0x8c50, OK, "Intel", "B85",		enable_flash_pch8},
-	{0x8086, 0x8c51, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c52, NT, "Intel", "C222",		enable_flash_pch8},
-	{0x8086, 0x8c53, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c54, NT, "Intel", "C224",		enable_flash_pch8},
-	{0x8086, 0x8c55, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c56, NT, "Intel", "C226",		enable_flash_pch8},
-	{0x8086, 0x8c57, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c58, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c59, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c5a, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c5b, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c5c, NT, "Intel", "H81",		enable_flash_pch8},
-	{0x8086, 0x8c5d, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c5e, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x8c5f, NT, "Intel", "Lynx Point",	enable_flash_pch8},
-	{0x8086, 0x9c41, NT, "Intel", "Lynx Point LP Engineering Sample", enable_flash_pch8_lp},
-	{0x8086, 0x9c43, NT, "Intel", "Lynx Point LP Premium", enable_flash_pch8_lp},
-	{0x8086, 0x9c45, NT, "Intel", "Lynx Point LP Mainstream", enable_flash_pch8_lp},
-	{0x8086, 0x9c47, NT, "Intel", "Lynx Point LP Value", enable_flash_pch8_lp},
- 	{0x8086, 0x8d40, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d41, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d42, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d43, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d44, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d45, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d46, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d47, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d48, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d49, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4a, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4b, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4c, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4d, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4e, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d4f, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d50, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d51, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d52, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d53, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d54, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d55, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d56, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d57, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d58, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d59, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5a, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5b, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5c, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5d, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5e, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
- 	{0x8086, 0x8d5f, NT, "Intel", "Wellsburg",	enable_flash_pch8_wb},
+	{0x1106, 0x0586, OK,  "VIA", "VT82C586A/B",			enable_flash_vt82c586},
+	{0x1106, 0x0596, OK,  "VIA", "VT82C596",			enable_flash_vt82c596},
+	{0x1106, 0x0686, OK,  "VIA", "VT82C686A/B",			enable_flash_vt82c596},
+	{0x1106, 0x3074, OK,  "VIA", "VT8233",				enable_flash_vt823x},
+	{0x1106, 0x3147, OK,  "VIA", "VT8233A",				enable_flash_vt823x},
+	{0x1106, 0x3177, OK,  "VIA", "VT8235",				enable_flash_vt823x},
+	{0x1106, 0x3227, OK,  "VIA", "VT8237(R)",			enable_flash_vt823x},
+	{0x1106, 0x3337, OK,  "VIA", "VT8237A",				enable_flash_vt823x},
+	{0x1106, 0x3372, OK,  "VIA", "VT8237S",				enable_flash_vt8237s_spi},
+	{0x1106, 0x8231, NT,  "VIA", "VT8231",				enable_flash_vt823x},
+	{0x1106, 0x8324, OK,  "VIA", "CX700",				enable_flash_vt823x},
+	{0x1106, 0x8353, NT,  "VIA", "VX800/VX820",			enable_flash_vt_vx},
+	{0x1106, 0x8409, NT,  "VIA", "VX855/VX875",			enable_flash_vt_vx},
+	{0x1106, 0x8410, NT,  "VIA", "VX900",				enable_flash_vt_vx},
+	{0x1166, 0x0200, OK,  "Broadcom", "OSB4",			enable_flash_osb4},
+	{0x1166, 0x0205, OK,  "Broadcom", "HT-1000",			enable_flash_ht1000},
+	{0x17f3, 0x6030, OK,  "RDC", "R8610/R3210",			enable_flash_rdc_r8610},
+	{0x8086, 0x0c60, NT,  "Intel", "S12x0",				enable_flash_s12x0},
+	{0x8086, 0x122e, OK,  "Intel", "PIIX",				enable_flash_piix4},
+	{0x8086, 0x1234, NT,  "Intel", "MPIIX",				enable_flash_piix4},
+	{0x8086, 0x1c44, DEP, "Intel", "Z68",				enable_flash_pch6},
+	{0x8086, 0x1c46, DEP, "Intel", "P67",				enable_flash_pch6},
+	{0x8086, 0x1c47, NT,  "Intel", "UM67",				enable_flash_pch6},
+	{0x8086, 0x1c49, NT,  "Intel", "HM65",				enable_flash_pch6},
+	{0x8086, 0x1c4a, DEP, "Intel", "H67",				enable_flash_pch6},
+	{0x8086, 0x1c4b, NT,  "Intel", "HM67",				enable_flash_pch6},
+	{0x8086, 0x1c4c, NT,  "Intel", "Q65",				enable_flash_pch6},
+	{0x8086, 0x1c4d, NT,  "Intel", "QS67",				enable_flash_pch6},
+	{0x8086, 0x1c4e, NT,  "Intel", "Q67",				enable_flash_pch6},
+	{0x8086, 0x1c4f, DEP, "Intel", "QM67",				enable_flash_pch6},
+	{0x8086, 0x1c50, NT,  "Intel", "B65",				enable_flash_pch6},
+	{0x8086, 0x1c52, NT,  "Intel", "C202",				enable_flash_pch6},
+	{0x8086, 0x1c54, DEP, "Intel", "C204",				enable_flash_pch6},
+	{0x8086, 0x1c56, NT,  "Intel", "C206",				enable_flash_pch6},
+	{0x8086, 0x1c5c, DEP, "Intel", "H61",				enable_flash_pch6},
+	{0x8086, 0x1d40, DEP, "Intel", "C60x/X79",			enable_flash_pch6},
+	{0x8086, 0x1d41, DEP, "Intel", "C60x/X79",			enable_flash_pch6},
+	{0x8086, 0x1e44, DEP, "Intel", "Z77",				enable_flash_pch7},
+	{0x8086, 0x1e46, NT,  "Intel", "Z75",				enable_flash_pch7},
+	{0x8086, 0x1e47, NT,  "Intel", "Q77",				enable_flash_pch7},
+	{0x8086, 0x1e48, NT,  "Intel", "Q75",				enable_flash_pch7},
+	{0x8086, 0x1e49, DEP, "Intel", "B75",				enable_flash_pch7},
+	{0x8086, 0x1e4a, DEP, "Intel", "H77",				enable_flash_pch7},
+	{0x8086, 0x1e53, NT,  "Intel", "C216",				enable_flash_pch7},
+	{0x8086, 0x1e55, DEP, "Intel", "QM77",				enable_flash_pch7},
+	{0x8086, 0x1e56, NT,  "Intel", "QS77",				enable_flash_pch7},
+	{0x8086, 0x1e57, DEP, "Intel", "HM77",				enable_flash_pch7},
+	{0x8086, 0x1e58, NT,  "Intel", "UM77",				enable_flash_pch7},
+	{0x8086, 0x1e59, NT,  "Intel", "HM76",				enable_flash_pch7},
+	{0x8086, 0x1e5d, NT,  "Intel", "HM75",				enable_flash_pch7},
+	{0x8086, 0x1e5e, NT,  "Intel", "HM70",				enable_flash_pch7},
+	{0x8086, 0x1e5f, DEP, "Intel", "NM70",				enable_flash_pch7},
+	{0x8086, 0x2310, NT,  "Intel", "DH89xxCC",			enable_flash_pch7},
+	{0x8086, 0x2390, NT,  "Intel", "Coleto Creek",			enable_flash_pch7},
+	{0x8086, 0x2410, OK,  "Intel", "ICH",				enable_flash_ich0},
+	{0x8086, 0x2420, OK,  "Intel", "ICH0",				enable_flash_ich0},
+	{0x8086, 0x2440, OK,  "Intel", "ICH2",				enable_flash_ich2345},
+	{0x8086, 0x244c, OK,  "Intel", "ICH2-M",			enable_flash_ich2345},
+	{0x8086, 0x2450, NT,  "Intel", "C-ICH",				enable_flash_ich2345},
+	{0x8086, 0x2480, OK,  "Intel", "ICH3-S",			enable_flash_ich2345},
+	{0x8086, 0x248c, OK,  "Intel", "ICH3-M",			enable_flash_ich2345},
+	{0x8086, 0x24c0, OK,  "Intel", "ICH4/ICH4-L",			enable_flash_ich2345},
+	{0x8086, 0x24cc, OK,  "Intel", "ICH4-M",			enable_flash_ich2345},
+	{0x8086, 0x24d0, OK,  "Intel", "ICH5/ICH5R",			enable_flash_ich2345},
+	{0x8086, 0x25a1, OK,  "Intel", "6300ESB",			enable_flash_ich2345},
+	{0x8086, 0x2640, OK,  "Intel", "ICH6/ICH6R",			enable_flash_ich6},
+	{0x8086, 0x2641, OK,  "Intel", "ICH6-M",			enable_flash_ich6},
+	{0x8086, 0x2642, NT,  "Intel", "ICH6W/ICH6RW",			enable_flash_ich6},
+	{0x8086, 0x2670, OK,  "Intel", "631xESB/632xESB/3100",		enable_flash_ich6},
+	{0x8086, 0x27b0, OK,  "Intel", "ICH7DH",			enable_flash_ich7},
+	{0x8086, 0x27b8, OK,  "Intel", "ICH7/ICH7R",			enable_flash_ich7},
+	{0x8086, 0x27b9, OK,  "Intel", "ICH7M",				enable_flash_ich7},
+	{0x8086, 0x27bc, OK,  "Intel", "NM10",				enable_flash_ich7},
+	{0x8086, 0x27bd, OK,  "Intel", "ICH7MDH",			enable_flash_ich7},
+	{0x8086, 0x2810, DEP, "Intel", "ICH8/ICH8R",			enable_flash_ich8},
+	{0x8086, 0x2811, DEP, "Intel", "ICH8M-E",			enable_flash_ich8},
+	{0x8086, 0x2812, DEP, "Intel", "ICH8DH",			enable_flash_ich8},
+	{0x8086, 0x2814, DEP, "Intel", "ICH8DO",			enable_flash_ich8},
+	{0x8086, 0x2815, DEP, "Intel", "ICH8M",				enable_flash_ich8},
+	{0x8086, 0x2910, DEP, "Intel", "ICH9 Eng. Sample",		enable_flash_ich9},
+	{0x8086, 0x2912, DEP, "Intel", "ICH9DH",			enable_flash_ich9},
+	{0x8086, 0x2914, DEP, "Intel", "ICH9DO",			enable_flash_ich9},
+	{0x8086, 0x2916, DEP, "Intel", "ICH9R",				enable_flash_ich9},
+	{0x8086, 0x2917, DEP, "Intel", "ICH9M-E",			enable_flash_ich9},
+	{0x8086, 0x2918, DEP, "Intel", "ICH9",				enable_flash_ich9},
+	{0x8086, 0x2919, DEP, "Intel", "ICH9M",				enable_flash_ich9},
+	{0x8086, 0x3a10, NT,  "Intel", "ICH10R Eng. Sample",		enable_flash_ich10},
+	{0x8086, 0x3a14, DEP, "Intel", "ICH10DO",			enable_flash_ich10},
+	{0x8086, 0x3a16, DEP, "Intel", "ICH10R",			enable_flash_ich10},
+	{0x8086, 0x3a18, DEP, "Intel", "ICH10",				enable_flash_ich10},
+	{0x8086, 0x3a1a, DEP, "Intel", "ICH10D",			enable_flash_ich10},
+	{0x8086, 0x3a1e, NT,  "Intel", "ICH10 Eng. Sample",		enable_flash_ich10},
+	{0x8086, 0x3b00, NT,  "Intel", "3400 Desktop",			enable_flash_pch5},
+	{0x8086, 0x3b01, NT,  "Intel", "3400 Mobile",			enable_flash_pch5},
+	{0x8086, 0x3b02, NT,  "Intel", "P55",				enable_flash_pch5},
+	{0x8086, 0x3b03, NT,  "Intel", "PM55",				enable_flash_pch5},
+	{0x8086, 0x3b06, DEP, "Intel", "H55",				enable_flash_pch5},
+	{0x8086, 0x3b07, DEP, "Intel", "QM57",				enable_flash_pch5},
+	{0x8086, 0x3b08, NT,  "Intel", "H57",				enable_flash_pch5},
+	{0x8086, 0x3b09, NT,  "Intel", "HM55",				enable_flash_pch5},
+	{0x8086, 0x3b0a, NT,  "Intel", "Q57",				enable_flash_pch5},
+	{0x8086, 0x3b0b, NT,  "Intel", "HM57",				enable_flash_pch5},
+	{0x8086, 0x3b0d, NT,  "Intel", "3400 Mobile SFF",		enable_flash_pch5},
+	{0x8086, 0x3b0e, NT,  "Intel", "B55",				enable_flash_pch5},
+	{0x8086, 0x3b0f, DEP, "Intel", "QS57",				enable_flash_pch5},
+	{0x8086, 0x3b12, NT,  "Intel", "3400",				enable_flash_pch5},
+	{0x8086, 0x3b14, DEP, "Intel", "3420",				enable_flash_pch5},
+	{0x8086, 0x3b16, NT,  "Intel", "3450",				enable_flash_pch5},
+	{0x8086, 0x3b1e, NT,  "Intel", "B55",				enable_flash_pch5},
+	{0x8086, 0x5031, OK,  "Intel", "EP80579",			enable_flash_ich7},
+	{0x8086, 0x7000, OK,  "Intel", "PIIX3",				enable_flash_piix4},
+	{0x8086, 0x7110, OK,  "Intel", "PIIX4/4E/4M",			enable_flash_piix4},
+	{0x8086, 0x7198, OK,  "Intel", "440MX",				enable_flash_piix4},
+	{0x8086, 0x8119, OK,  "Intel", "SCH Poulsbo",			enable_flash_poulsbo},
+	{0x8086, 0x8186, OK,  "Intel", "Atom E6xx(T)/Tunnel Creek",	enable_flash_tunnelcreek},
+	{0x8086, 0x8c40, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c41, NT,  "Intel", "Lynx Point Mobile Eng. Sample",	enable_flash_pch8},
+	{0x8086, 0x8c42, NT,  "Intel", "Lynx Point Desktop Eng. Sample",enable_flash_pch8},
+	{0x8086, 0x8c43, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c44, DEP, "Intel", "Z87",				enable_flash_pch8},
+	{0x8086, 0x8c45, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c46, NT,  "Intel", "Z85",				enable_flash_pch8},
+	{0x8086, 0x8c47, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c48, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c49, NT,  "Intel", "HM86",				enable_flash_pch8},
+	{0x8086, 0x8c4a, DEP, "Intel", "H87",				enable_flash_pch8},
+	{0x8086, 0x8c4b, DEP, "Intel", "HM87",				enable_flash_pch8},
+	{0x8086, 0x8c4c, NT,  "Intel", "Q85",				enable_flash_pch8},
+	{0x8086, 0x8c4d, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c4e, NT,  "Intel", "Q87",				enable_flash_pch8},
+	{0x8086, 0x8c4f, NT,  "Intel", "QM87",				enable_flash_pch8},
+	{0x8086, 0x8c50, DEP, "Intel", "B85",				enable_flash_pch8},
+	{0x8086, 0x8c51, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c52, NT,  "Intel", "C222",				enable_flash_pch8},
+	{0x8086, 0x8c53, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c54, NT,  "Intel", "C224",				enable_flash_pch8},
+	{0x8086, 0x8c55, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c56, NT,  "Intel", "C226",				enable_flash_pch8},
+	{0x8086, 0x8c57, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c58, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c59, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c5a, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c5b, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c5c, NT,  "Intel", "H81",				enable_flash_pch8},
+	{0x8086, 0x8c5d, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c5e, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x8c5f, NT,  "Intel", "Lynx Point",			enable_flash_pch8},
+	{0x8086, 0x9c41, NT,  "Intel", "Lynx Point LP Eng. Sample",	enable_flash_pch8_lp},
+	{0x8086, 0x9c43, NT,  "Intel", "Lynx Point LP Premium",		enable_flash_pch8_lp},
+	{0x8086, 0x9c45, NT,  "Intel", "Lynx Point LP Mainstream",	enable_flash_pch8_lp},
+	{0x8086, 0x9c47, NT,  "Intel", "Lynx Point LP Value",		enable_flash_pch8_lp},
+ 	{0x8086, 0x8d40, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d41, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d42, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d43, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d44, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d45, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d46, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d47, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d48, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d49, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4a, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4b, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4c, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4d, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4e, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d4f, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d50, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d51, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d52, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d53, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d54, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d55, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d56, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d57, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d58, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d59, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5a, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5b, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5c, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5d, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5e, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
+ 	{0x8086, 0x8d5f, NT,  "Intel", "Wellsburg",			enable_flash_pch8_wb},
 #endif
 	{0},
 };
diff --git a/print.c b/print.c
index 9aef8d8..efd834d 100644
--- a/print.c
+++ b/print.c
@@ -395,7 +395,7 @@
 	for (i = strlen("Chipset"); i < maxchipsetlen; i++)
 		msg_ginfo(" ");
 
-	msg_ginfo("PCI IDs   State\n\n");
+	msg_ginfo("PCI IDs    Status\n\n");
 
 	for (c = chipset_enables; c->vendor_name != NULL; c++) {
 		msg_ginfo("%s", c->vendor_name);
@@ -404,8 +404,8 @@
 		msg_ginfo("%s", c->device_name);
 		for (i = 0; i < maxchipsetlen - strlen(c->device_name); i++)
 			msg_ginfo(" ");
-		msg_ginfo("%04x:%04x%s\n", c->vendor_id, c->device_id,
-		       (c->status == NT) ? " (untested)" : "");
+		msg_ginfo("%04x:%04x  %s\n", c->vendor_id, c->device_id,
+		       test_state_to_text(c->status));
 	}
 }