diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
tree | de6ca90295730343c495be8d98be8efa322140ef /include/pcmcia/ss.h | |
parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r-- | include/pcmcia/ss.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 9b4ac9385f5d..9a3b49865173 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -90,14 +90,14 @@ typedef struct pccard_io_map { | |||
90 | u_char map; | 90 | u_char map; |
91 | u_char flags; | 91 | u_char flags; |
92 | u_short speed; | 92 | u_short speed; |
93 | u_int start, stop; | 93 | phys_addr_t start, stop; |
94 | } pccard_io_map; | 94 | } pccard_io_map; |
95 | 95 | ||
96 | typedef struct pccard_mem_map { | 96 | typedef struct pccard_mem_map { |
97 | u_char map; | 97 | u_char map; |
98 | u_char flags; | 98 | u_char flags; |
99 | u_short speed; | 99 | u_short speed; |
100 | u_long static_start; | 100 | phys_addr_t static_start; |
101 | u_int card_start; | 101 | u_int card_start; |
102 | struct resource *res; | 102 | struct resource *res; |
103 | } pccard_mem_map; | 103 | } pccard_mem_map; |