patch-2.4.20 linux-2.4.20/include/asm-mips/au1000_pcmcia.h

• Lines: 48
• Date: Thu Nov 28 15:53:15 2002
• Orig file: linux-2.4.19/include/asm-mips/au1000_pcmcia.h
• Orig date: Fri Aug 2 17:39:45 2002

diff -urN linux-2.4.19/include/asm-mips/au1000_pcmcia.h linux-2.4.20/include/asm-mips/au1000_pcmcia.h
@@ -23,12 +23,11 @@
  *
  * ########################################################################
  *
- * 
+ *
  */
 #ifndef __ASM_AU1000_PCMCIA_H
 #define __ASM_AU1000_PCMCIA_H
 
-#include <linux/config.h>
 
 #define AU1000_PCMCIA_POLL_PERIOD    (2*HZ)
 #define AU1000_PCMCIA_IO_SPEED       (255)
@@ -60,6 +59,8 @@
 	unsigned int irq;
 };
 
+typedef u_int memaddr_t;	/* fix me */
+
 struct au1000_pcmcia_socket {
 	socket_state_t        cs_state;
 	struct pcmcia_state   k_state;
@@ -68,7 +69,8 @@
 	void                  *handler_info;
 	pccard_io_map         io_map[MAX_IO_WIN];
 	pccard_mem_map        mem_map[MAX_WIN];
-	u32                   virt_io, phys_attr, phys_mem;
+	u32                   virt_io;
+	memaddr_t             phys_attr, phys_mem;	/*FIX ME*/
 	unsigned short        speed_io, speed_attr, speed_mem;
 };
 
@@ -84,10 +86,10 @@
 	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;
+#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 */