diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /include/pcmcia | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/pcmcia')
| -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; |