Multiple unrelated changes

* SST_49LF040B flash support for flashrom
* add ICH4-M support to flashrom

Corresponding to flashrom svn r52 and coreboot v2 svn r2230.

Signed-off-by: Scott Tsai <scott.tsai@arima.com.tw>
diff --git a/flash_enable.c b/flash_enable.c
index 8334b6d..d03a36b 100644
--- a/flash_enable.c
+++ b/flash_enable.c
@@ -385,6 +385,7 @@
 	{0x1039, 0x0630, "sis630", enable_flash_sis630},
 	{0x8086, 0x2480, "E7500", enable_flash_e7500},
 	{0x8086, 0x24c0, "ICH4", enable_flash_ich4},
+	{0x8086, 0x24cc, "ICH4-M", enable_flash_ich4},
 	{0x8086, 0x24d0, "ICH5", enable_flash_ich4},
 	{0x8086, 0x27b8, "ICH7", enable_flash_ich7},
 	{0x1106, 0x8231, "VT8231", enable_flash_vt8231},