Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv30920/include/asm-mips
Modified Files:
au1000_pcmcia.h
Log Message:
Consolidated the pcmcia pb1x00 files -- brute force approach.
Index: au1000_pcmcia.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000_pcmcia.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- au1000_pcmcia.h 18 Apr 2002 00:03:28 -0000 1.7
+++ au1000_pcmcia.h 19 Apr 2002 19:12:52 -0000 1.8
@@ -85,12 +85,9 @@
int (*configure_socket)(const struct pcmcia_configure *);
};
-#ifdef CONFIG_MIPS_PB1000
-extern struct pcmcia_low_level pb1000_pcmcia_ops;
-#elif defined (CONFIG_MIPS_PB1500)
-extern struct pcmcia_low_level pb1500_pcmcia_ops;
-#elif defined (CONFIG_MIPS_PB1100)
-extern struct pcmcia_low_level pb1100_pcmcia_ops;
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500)
+extern struct pcmcia_low_level pb1x00_pcmcia_ops;
+#else
+error unknown Au1000 board
#endif
-
#endif /* __ASM_AU1000_PCMCIA_H */
|
