diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 08:11:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 08:11:23 -0700 |
| commit | 0950efd1a1490e869d19ec631eed75ef57772f8b (patch) | |
| tree | ee1138885190a3c7f6a0631c118ebb4ecbd3cb7a /include | |
| parent | 4406c56d0a4da7a37b9180abeaece6cd00bcc874 (diff) | |
| parent | 889c27744c30eb7a43b68c11e33e679cfafc8cd5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
pcmcia: document return value of pcmcia_loop_config
pcmcia: dtl1_cs: fix pcmcia_loop_config logic
pcmcia: drop non-existant includes
pcmcia: disable prefetch/burst for OZ6933
pcmcia: fix incorrect argument order to list_add_tail()
pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
pcmcia: Use phys_addr_t for physical addresses
pcmcia: drivers/pcmcia: Make static
Diffstat (limited to 'include')
| -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 9b4ac9385f5..9a3b4986517 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -90,14 +90,14 @@ typedef struct pccard_io_map { u_char map; u_char flags; u_short speed; - u_int start, stop; + phys_addr_t start, stop; } pccard_io_map; typedef struct pccard_mem_map { u_char map; u_char flags; u_short speed; - u_long static_start; + phys_addr_t static_start; u_int card_start; struct resource *res; } pccard_mem_map; |