[LV-kern-commit] CVS: kernel-2.4/include/pcmcia ciscode.h,1.1.1.2,1.2 cs_types.h,1.1.1.2,1.2 ss.h,1.1.1.2,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv26214/pcmcia

Modified Files:
	ciscode.h cs_types.h ss.h 
Log Message:
synch 2.4.15 commit 10


Index: ciscode.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/pcmcia/ciscode.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- ciscode.h	25 Feb 2001 23:14:53 -0000	1.1.1.2
+++ ciscode.h	9 Apr 2002 13:07:33 -0000	1.2
@@ -112,10 +112,12 @@
 #define PRODID_SOCKET_DUAL_RS232	0x0006
 #define PRODID_SOCKET_EIO		0x000a
 #define PRODID_SOCKET_LPE		0x000d
+#define PRODID_SOCKET_LPE_CF		0x0075
 
 #define MANFID_SUNDISK			0x0045
 
 #define MANFID_TDK			0x0105
+#define PRODID_TDK_CF010		0x0900
 
 #define MANFID_TOSHIBA			0x0098
 

Index: cs_types.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/pcmcia/cs_types.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- cs_types.h	25 Feb 2001 23:14:53 -0000	1.1.1.2
+++ cs_types.h	9 Apr 2002 13:07:33 -0000	1.2
@@ -36,8 +36,13 @@
 #include <sys/types.h>
 #endif
 
-typedef u_short	socket_t;
+#ifdef __arm__
+typedef u_int   ioaddr_t;
+#else
 typedef u_short	ioaddr_t;
+#endif
+
+typedef u_short	socket_t;
 typedef u_int	event_t;
 typedef u_char	cisdata_t;
 typedef u_short	page_t;

Index: ss.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/pcmcia/ss.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- ss.h	25 Feb 2001 23:14:53 -0000	1.1.1.2
+++ ss.h	9 Apr 2002 13:07:33 -0000	1.2
@@ -30,6 +30,8 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
+#include <pcmcia/cs_types.h>
+
 /* Definitions for card status flags for GetStatus */
 #define SS_WRPROT	0x0001
 #define SS_CARDLOCK	0x0002
@@ -52,6 +54,7 @@
     u_int	features;
     u_int	irq_mask;
     u_int	map_size;
+    ioaddr_t	io_offset;
     u_char	pci_irq;
     struct pci_dev *cb_dev;
     struct bus_operations *bus;
@@ -101,7 +104,7 @@
     u_char	map;
     u_char	flags;
     u_short	speed;
-    u_short	start, stop;
+    ioaddr_t	start, stop;
 } pccard_io_map;
 
 typedef struct pccard_mem_map {