netfilter: xt_LOG: don't use xchg() for simple assignment

[pandora-kernel.git] / include / linux / ioc3.h

diff --git a/include/linux/ioc3.h b/include/linux/ioc3.h
index e7906a7..38b286e 100644 (file)
--- a/include/linux/ioc3.h
+++ b/include/linux/ioc3.h
@@ -27,7 +27,7 @@ struct ioc3_driver_data {
        int id;                         /* IOC3 sequence number */
        /* PCI mapping */
        unsigned long pma;              /* physical address */
-       struct __iomem ioc3 *vma;       /* pointer to registers */
+       struct ioc3 __iomem *vma;       /* pointer to registers */
        struct pci_dev *pdev;           /* PCI device */
        /* IRQ stuff */
        int dual_irq;                   /* set if separate IRQs are used */
@@ -63,7 +63,7 @@ struct ioc3_submodule {
        /* IRQ stuff */
        unsigned int irq_mask;  /* IOC3 IRQ mask, leave clear for Ethernet */
        int reset_mask;         /* non-zero if you want the ioc3.c module to reset interrupts */
-       int (*intr) (struct ioc3_submodule *, struct ioc3_driver_data *, unsigned int, struct pt_regs *);
+       int (*intr) (struct ioc3_submodule *, struct ioc3_driver_data *, unsigned int);
        /* private submodule data */
        void *data;             /* assigned by submodule */
 };