diff options
Diffstat (limited to 'include/pcmcia')
-rw-r--r-- | include/pcmcia/cs_types.h | 1 | ||||
-rw-r--r-- | include/pcmcia/ss.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h index 5f388035687d..9a6bcc4952f0 100644 --- a/include/pcmcia/cs_types.h +++ b/include/pcmcia/cs_types.h | |||
@@ -27,7 +27,6 @@ typedef u_int ioaddr_t; | |||
27 | #else | 27 | #else |
28 | typedef u_short ioaddr_t; | 28 | typedef u_short ioaddr_t; |
29 | #endif | 29 | #endif |
30 | typedef unsigned long kio_addr_t; | ||
31 | 30 | ||
32 | typedef u_short socket_t; | 31 | typedef u_short socket_t; |
33 | typedef u_int event_t; | 32 | typedef u_int event_t; |
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 | ||
98 | typedef struct pccard_mem_map { | 98 | typedef struct pccard_mem_map { |
@@ -155,7 +155,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops; | |||
155 | struct pcmcia_socket; | 155 | struct pcmcia_socket; |
156 | 156 | ||
157 | typedef struct io_window_t { | 157 | typedef 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 | ||