Return of ifdefs in cfi_probe.c

[David Woodhouse]

The use of weak symbols was intended to render the ifdefs which you 
restored unnecessary. Are you sure it didn't work right in 2.0 the way I 
left it?

--- cfi_probe.c	2000/12/18 00:03:26	1.30
+++ cfi_probe.c	2000/12/18 16:14:51	1.31
@@ -1,7 +1,7 @@
 /* 
    Common Flash Interface probe code.
    (C) 2000 Red Hat. GPL'd.
-   $Id: cfi_probe.c,v 1.30 2000/12/18 00:03:26 dwmw2 Exp $
+   $Id: cfi_probe.c,v 1.31 2000/12/18 16:14:51 eauth Exp $
 */
 
 #include <linux/config.h>
@@ -741,21 +741,23 @@
 		return;
 
 	switch(type){
+#ifdef CONFIG_MTD_CFI_INTELEXT
 	case 0x0001:
 		probe_function = cfi_cmdset_0001;
 		break;
-
+#endif
+#ifdef CONFIG_MTD_CFI_AMDSTD 
 	case 0x0002:
 		probe_function = cfi_cmdset_0002;
 		break;
+#endif

--
dwmw2




To unsubscribe, send "unsubscribe mtd" to majordomo at infradead.org