Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / pcmcia / au1000_generic.h

diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index c62437df175e4bf2f384c92e7b5262d7663e9e17..13a4fbc587116e076e34ccd981deaa36d9ac4e3f 100644 (file)
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -26,7 +26,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
@@ -117,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;