summaryrefslogtreecommitdiff
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-28 01:05:34 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-29 09:43:14 +0200
commitd39bd56452b509f8d6054883b8a0129950ba50cc (patch)
treea73caaee8d691d43bfc23cb21e8c33edf31c4205 /include/pcmcia
parenta58357862e71919555ea96cd272e535593a8b3da (diff)
downloadlinux-next-d39bd56452b509f8d6054883b8a0129950ba50cc.tar.gz
pcmcia: encapsulate ioaddr_t
By now, ioaddr_t should only be used by the deprecated ioctl, as it does not correctly reflect the maximum ioport range at least on some architectures. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-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 @@
#include <sys/types.h>
#endif
-#if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \
- defined(__bfin__)
-/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
-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;
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);
#if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__)
+#if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \
+ defined(__bfin__)
+/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
+typedef u_int ioaddr_t;
+#else
+typedef u_short ioaddr_t;
+#endif
+
/* for AdjustResourceInfo */
typedef struct adjust_t {
u_int Action;