From 054f8a8f373e4f7ab28e912c54d014c886e4efb5 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu, 28 Aug 2008 01:05:34 +0200
Subject: [PATCH] --- yaml --- r: 114154 b: refs/heads/master c:
 d39bd56452b509f8d6054883b8a0129950ba50cc h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pcmcia/au1000_generic.c | 2 +-
 trunk/drivers/pcmcia/au1000_generic.h | 2 +-
 trunk/drivers/usb/host/sl811_cs.c     | 3 ++-
 trunk/include/pcmcia/cs_types.h       | 8 --------
 trunk/include/pcmcia/ds.h             | 8 ++++++++
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a7e2a446099b..5f09715eadd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58357862e71919555ea96cd272e535593a8b3da
+refs/heads/master: d39bd56452b509f8d6054883b8a0129950ba50cc
diff --git a/trunk/drivers/pcmcia/au1000_generic.c b/trunk/drivers/pcmcia/au1000_generic.c
index 75e8f8505e47..fc1de46fd20a 100644
--- a/trunk/drivers/pcmcia/au1000_generic.c
+++ b/trunk/drivers/pcmcia/au1000_generic.c
@@ -292,7 +292,7 @@ au1x00_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map)
 		skt->spd_io[map->map] = speed;
 	}
 
-	map->start=(ioaddr_t)(u32)skt->virt_io;
+	map->start=(unsigned int)(u32)skt->virt_io;
 	map->stop=map->start+MAP_SIZE;
 	return 0;
 
diff --git a/trunk/drivers/pcmcia/au1000_generic.h b/trunk/drivers/pcmcia/au1000_generic.h
index a53ef5902518..13a4fbc58711 100644
--- a/trunk/drivers/pcmcia/au1000_generic.h
+++ b/trunk/drivers/pcmcia/au1000_generic.h
@@ -116,7 +116,7 @@ struct au1000_pcmcia_socket {
 	struct resource		res_attr;
 
 	void *                 	virt_io;
-	ioaddr_t              	phys_io;
+	unsigned int		phys_io;
 	unsigned int           	phys_attr;
 	unsigned int           	phys_mem;
 	unsigned short        	speed_io, speed_attr, speed_mem;
diff --git a/trunk/drivers/usb/host/sl811_cs.c b/trunk/drivers/usb/host/sl811_cs.c
index ca733b7caea4..516848dd9b48 100644
--- a/trunk/drivers/usb/host/sl811_cs.c
+++ b/trunk/drivers/usb/host/sl811_cs.c
@@ -112,7 +112,8 @@ static struct platform_device platform_dev = {
 	.num_resources		= ARRAY_SIZE(resources),
 };
 
-static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)
+static int sl811_hc_init(struct device *parent, resource_size_t base_addr,
+			 int irq)
 {
 	if (platform_dev.dev.parent)
 		return -EBUSY;
diff --git a/trunk/include/pcmcia/cs_types.h b/trunk/include/pcmcia/cs_types.h
index f402a0f435b4..315965a37930 100644
--- a/trunk/include/pcmcia/cs_types.h
+++ b/trunk/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/trunk/include/pcmcia/ds.h b/trunk/include/pcmcia/ds.h
index bdf7d5e474f7..279df0fb036e 100644
--- a/trunk/include/pcmcia/ds.h
+++ b/trunk/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;