aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ss.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2008-02-05 01:27:35 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:08 -0500
commit906da809c5be30b4c7f32bb6a489fb25ad794878 (patch)
tree9516df9eb1a64ee94d185d2711bde3d1defaabb5 /include/pcmcia/ss.h
parentecb8a8472f6d314096f20885722f2033d2071719 (diff)
pcmcia: replace kio_addr_t with unsigned int everywhere
Remove kio_addr_t, and replace it with unsigned int. No known architecture needs more than 32 bits for IO addresses and ports and having a separate type for it is just messy. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Christoph Hellwig <hch@lst.de> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r--include/pcmcia/ss.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 6e84258b94de..f95dca077c1c 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -92,7 +92,7 @@ typedef struct pccard_io_map {
92 u_char map; 92 u_char map;
93 u_char flags; 93 u_char flags;
94 u_short speed; 94 u_short speed;
95 kio_addr_t start, stop; 95 u_int start, stop;
96} pccard_io_map; 96} pccard_io_map;
97 97
98typedef struct pccard_mem_map { 98typedef struct pccard_mem_map {
@@ -155,7 +155,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops;
155struct pcmcia_socket; 155struct pcmcia_socket;
156 156
157typedef struct io_window_t { 157typedef struct io_window_t {
158 kio_addr_t InUse, Config; 158 u_int InUse, Config;
159 struct resource *res; 159 struct resource *res;
160} io_window_t; 160} io_window_t;
161 161
@@ -208,7 +208,7 @@ struct pcmcia_socket {
208 u_int features; 208 u_int features;
209 u_int irq_mask; 209 u_int irq_mask;
210 u_int map_size; 210 u_int map_size;
211 kio_addr_t io_offset; 211 u_int io_offset;
212 u_char pci_irq; 212 u_char pci_irq;
213 struct pci_dev * cb_dev; 213 struct pci_dev * cb_dev;
214 214