Index: pm49fl004.c
===================================================================
--- pm49fl004.c	(revision 2455)
+++ pm49fl004.c	(working copy)
@@ -1,57 +0,0 @@
-/*
- * pm49fl004.c: driver for Pm49FL004 flash models.
- *
- *
- * Copyright 2004 Tyan Corporation
- *	yhlu yhlu@tyan.com add exclude range
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 2 of the License, or
- *	(at your option) any later version.
- *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- */
-
-#include <stdio.h>
-#include "flash.h"
-#include "jedec.h"
-#include "pm49fl004.h"
-
-extern int exclude_start_page, exclude_end_page;
-
-int write_49fl004(struct flashchip *flash, uint8_t *buf)
-{
-	int i;
-	int total_size = flash->total_size * 1024, page_size =
-		flash->page_size;
-	volatile uint8_t *bios = flash->virt_addr;
-	
-	printf("Programming Page: ");
-	for (i = 0; i < total_size / page_size; i++) {
-		if( (i>=exclude_start_page) && (i<exclude_end_page)) 	
-			continue;
-		
-		/* erase the page before programming */
-		erase_block_jedec(bios, i * page_size);
-
-		/* write to the sector */
-		printf("%04d at address: 0x%08x", i, i * page_size);
-		write_sector_jedec(bios, buf + i * page_size,
-				   bios + i * page_size, page_size);
-		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");
-		fflush(stdout);
-	}
-	printf("\n");
-
-	return (0);
-}
Index: flash_enable.c
===================================================================
--- flash_enable.c	(revision 2455)
+++ flash_enable.c	(working copy)
@@ -389,7 +389,12 @@
         {0x10de, 0x0050, "NVIDIA CK804", enable_flash_ck804}, // LPC
         {0x10de, 0x0051, "NVIDIA CK804", enable_flash_ck804}, // Pro
         {0x10de, 0x00d3, "NVIDIA CK804", enable_flash_ck804}, // Slave, should not be here, to fix known bug for A01.
-	{0x10de, 0x0261, "NVIDIA C51",   enable_flash_ck804},
+
+        {0x10de, 0x0260, "NVidia MCP51", enable_flash_ck804},
+        {0x10de, 0x0261, "NVidia MCP51", enable_flash_ck804},
+        {0x10de, 0x0262, "NVidia MCP51", enable_flash_ck804},
+        {0x10de, 0x0263, "NVidia MCP51", enable_flash_ck804},
+
 	{0x1002, 0x4377, "ATI SB400", enable_flash_sb400}, // ATI Technologies Inc IXP SB400 PCI-ISA Bridge (rev 80)
 };