mtd/drivers/mtd/devices docprobe.c,1.36,1.37

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/devices
In directory phoenix.infradead.org:/tmp/cvs-serv18679

Modified Files:
	docprobe.c 
Log Message:
Don't attempt to drive the Millennium Plus 16. We can't.


Index: docprobe.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/docprobe.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- docprobe.c	23 May 2003 11:29:34 -0000	1.36
+++ docprobe.c	30 Jun 2003 09:01:46 -0000	1.37
@@ -157,6 +157,9 @@
 		break;
 		
 	case DOC_ChipID_DocMilPlus16:
+		printk(KERN_WARNING "DiskOnChip Millennium Plus 16MiB not yet supported. Sorry.\n");
+		return 0;
+
 	case DOC_ChipID_DocMilPlus32:
 	case 0:
 		/* Possible Millennium+, need to do more checks */
@@ -184,6 +187,9 @@
 
 		switch (ChipID) {
 		case DOC_ChipID_DocMilPlus16:
+			printk(KERN_NOTICE "DiskOnChip Millennium Plus 16MiB not yet supported. Sorry\n");
+			return 0;
+
 		case DOC_ChipID_DocMilPlus32:
 			/* Check the TOGGLE bit in the toggle register */
 			tmp  = ReadDOC(window, Mplus_Toggle) & DOC_TOGGLE_BIT;
@@ -199,8 +205,8 @@
 
 	default:
 
-#ifndef CONFIG_MTD_DOCPROBE_55AA
-		printk(KERN_WARNING "Possible DiskOnChip with unknown ChipID %2.2X found at 0x%lx\n",
+#ifdef CONFIG_MTD_DOCPROBE_55AA
+		printk(KERN_DEBUG "Possible DiskOnChip with unknown ChipID %2.2X found at 0x%lx\n",
 		       ChipID, physadr);
 #endif
 #ifndef DOC_PASSIVE_PROBE