4 files changed, 12 insertions, 12 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index afc2bfb9e917..75fa3530345b 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -126,8 +126,8 @@ typedef struct irq_req_t {
 #define IRQ_TYPE_TIME                   0x01
 #define IRQ_TYPE_DYNAMIC_SHARING        0x02
 #define IRQ_FORCED_PULSE                0x04
-#define IRQ_FIRST_SHARED                0x08
-//#define IRQ_HANDLE_PRESENT            0x10
+#define IRQ_FIRST_SHARED                0x08 /* unused */
+#define IRQ_HANDLE_PRESENT              0x10 /* unused */
 #define IRQ_PULSE_ALLOCATED             0x100
 
 /* Bits in IRQInfo1 field */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index d403c12f7978..ee148573c114 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -82,7 +82,7 @@ struct pcmcia_device {
         /* the hardware "function" device; certain subdevices can
          * share one hardware "function" device. */
         u8                      func;
-        struct config_t*        function_config;
+        struct config_t         *function_config;
 
         struct list_head        socket_device_list;
 
@@ -121,14 +121,14 @@ struct pcmcia_device {
         u16                     manf_id;
         u16                     card_id;
 
-        char *                  prod_id[4];
+        char                    *prod_id[4];
 
         u64                     dma_mask;
         struct device           dev;
 
 #ifdef CONFIG_PCMCIA_IOCTL
         /* device driver wanted by cardmgr */
-        struct pcmcia_driver *  cardmgr;
+        struct pcmcia_driver    *cardmgr;
 #endif
 
         /* data private to drivers */
diff --git a/include/pcmcia/mem_op.h b/include/pcmcia/mem_op.h
index 8d19b9401a5b..0fa06e5d5376 100644
--- a/include/pcmcia/mem_op.h
+++ b/include/pcmcia/mem_op.h
@@ -15,8 +15,8 @@
 #ifndef _LINUX_MEM_OP_H
 #define _LINUX_MEM_OP_H
 
+#include <linux/io.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 /*
    If UNSAFE_MEMCPY is defined, we use the (optimized) system routines
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 7c23be706f12..cbfba885eb85 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -154,7 +154,7 @@ struct pcmcia_socket {
         struct list_head                socket_list;
         struct completion               socket_released;
 
-        /* deprecated */
+        /* deprecated */
         unsigned int                    sock;           /* socket number */
 
 
@@ -164,7 +164,7 @@ struct pcmcia_socket {
         u_int                           map_size;
         u_int                           io_offset;
         u_int                           pci_irq;
-        struct pci_dev *                cb_dev;
+        struct pci_dev                  *cb_dev;
 
 
         /* socket setup is done so resources should be able to be allocated.
@@ -179,9 +179,9 @@ struct pcmcia_socket {
         u8                              reserved:5;
 
         /* socket operations */
-        struct pccard_operations *      ops;
-        struct pccard_resource_ops *    resource_ops;
-        void *                          resource_data;
+        struct pccard_operations        *ops;
+        struct pccard_resource_ops      *resource_ops;
+        void                            *resource_data;
 
         /* Zoom video behaviour is so chip specific its not worth adding
            this to _ops */
@@ -245,7 +245,7 @@ struct pcmcia_socket {
 
         /* cardbus (32-bit) */
 #ifdef CONFIG_CARDBUS
-        struct resource *               cb_cis_res;
+        struct resource                 *cb_cis_res;
         void __iomem                    *cb_cis_virt;
 #endif /* CONFIG_CARDBUS */