patch-2.3.23 linux/include/pcmcia/cs.h

• Lines: 46
• Date: Wed Oct 20 21:33:12 1999
• Orig file: v2.3.22/linux/include/pcmcia/cs.h
• Orig date: Tue Sep 7 12:14:07 1999

diff -u --recursive --new-file v2.3.22/linux/include/pcmcia/cs.h linux/include/pcmcia/cs.h
@@ -1,5 +1,5 @@
 /*
- * cs.h 1.67 1999/09/02 18:34:59
+ * cs.h 1.68 1999/10/20 18:59:32
  *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
@@ -292,6 +292,7 @@
 #define WIN_SHARED		0x0040
 #define WIN_FIRST_SHARED	0x0080
 #define WIN_USE_WAIT		0x0100
+#define WIN_STRICT_ALIGN	0x0200
 #define WIN_MAP_BELOW_1MB	0x0400
 #define WIN_PREFETCH		0x0800
 #define WIN_CACHEABLE		0x1000
@@ -437,30 +438,6 @@
 extern int CardServices(int func, void *a1, void *a2, void *a3);
 #else
 extern int CardServices(int func, ...);
-#endif
-
-#ifdef __BEOS__
-#define SS_MODULE_NAME(s)	("busses/pcmcia/" s "/v1")
-#define MTD_MODULE_NAME(s)	("busses/pcmcia/" s "/v1")
-#define CS_CLIENT_MODULE_NAME	"bus_managers/pcmcia_cs/client/v1"
-typedef struct cs_client_module_info {
-    bus_manager_info	binfo;
-    int (*_CardServices)(int, ...);
-    int (*_MTDHelperEntry)(int, ...);
-    void (*_add_timer)(struct timer_list *);
-    void (*_del_timer)(struct timer_list *);
-} cs_client_module_info;
-#define CS_SOCKET_MODULE_NAME "bus_managers/pcmcia_cs/socket/v1"
-typedef struct cs_socket_module_info {
-    bus_manager_info	binfo;
-    int (*_register_ss_entry)(int, ss_entry_t);
-    void (*_unregister_ss_entry)(ss_entry_t);
-    void (*_add_timer)(struct timer_list *);
-    void (*_del_timer)(struct timer_list *);
-    int (*register_resource)(int, u_long, u_long);
-    int (*release_resource)(int, u_long, u_long);
-    int (*check_resource)(int, u_long, u_long);
-} cs_socket_module_info;
 #endif
 
 #endif /* __KERNEL__ */