projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[linux-2.6]
/
drivers
/
pcmcia
/
au1000_generic.h
diff --git
a/drivers/pcmcia/au1000_generic.h
b/drivers/pcmcia/au1000_generic.h
index
a53ef59
..
13a4fbc
100644
(file)
--- a/
drivers/pcmcia/au1000_generic.h
+++ b/
drivers/pcmcia/au1000_generic.h
@@
-116,7
+116,7
@@
struct au1000_pcmcia_socket {
struct resource res_attr;
void * virt_io;
-
ioaddr_t
phys_io;
+
unsigned int
phys_io;
unsigned int phys_attr;
unsigned int phys_mem;
unsigned short speed_io, speed_attr, speed_mem;