Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel

[pandora-kernel.git] / include / pcmcia / cs_types.h

diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index c1d1629..f402a0f 100644 (file)
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -21,22 +21,19 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__arm__) || defined(__mips__)
+#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 unsigned long kio_addr_t;
 
 typedef u_short        socket_t;
 typedef u_int  event_t;
 typedef u_char cisdata_t;
 typedef u_short        page_t;
 
-struct pcmcia_device;
-typedef struct pcmcia_device *client_handle_t;
-
 struct window_t;
 typedef struct window_t *window_handle_t;