aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/cs_types.h8
-rw-r--r--include/pcmcia/ds.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index f402a0f435b4..315965a37930 100644
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -21,14 +21,6 @@
21#include <sys/types.h> 21#include <sys/types.h>
22#endif 22#endif
23 23
24#if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \
25 defined(__bfin__)
26/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
27typedef u_int ioaddr_t;
28#else
29typedef u_short ioaddr_t;
30#endif
31
32typedef u_short socket_t; 24typedef u_short socket_t;
33typedef u_int event_t; 25typedef u_int event_t;
34typedef u_char cisdata_t; 26typedef u_char cisdata_t;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index bdf7d5e474f7..279df0fb036e 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -171,6 +171,14 @@ const char *pcmcia_error_ret(int ret);
171 171
172#if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__) 172#if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__)
173 173
174#if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \
175 defined(__bfin__)
176/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
177typedef u_int ioaddr_t;
178#else
179typedef u_short ioaddr_t;
180#endif
181
174/* for AdjustResourceInfo */ 182/* for AdjustResourceInfo */
175typedef struct adjust_t { 183typedef struct adjust_t {
176 u_int Action; 184 u_int Action;