generic: ar8216: add setup_port field to ar8xxx_chip

[openwrt.git] / target / linux / generic / files / crypto / ocf / hifn / hifnHIPP.c

diff --git a/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c b/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
index cdc23e9..5bb5602 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
+++ b/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
@@ -33,10 +33,8 @@
  * Driver for various Hifn encryption processors.
  */
 #include <linux/version.h>
  * Driver for various Hifn encryption processors.
  */
 #include <linux/version.h>

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-#include <generated/autoconf.h>
-#else
-#include <linux/autoconf.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>

 #endif
 #include <linux/module.h>
 #include <linux/init.h>
 #endif
 #include <linux/module.h>
 #include <linux/init.h>


@@ -49,7 +47,6 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/random.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/random.h>

-#include <linux/version.h>

 #include <linux/skbuff.h>
 #include <linux/uio.h>
 #include <linux/sysfs.h>
 #include <linux/skbuff.h>
 #include <linux/uio.h>
 #include <linux/sysfs.h>


@@ -211,7 +208,7 @@ hipp_probe(struct pci_dev *dev, const struct pci_device_id *ent)
        if (pci_enable_device(dev) < 0)
                return(-ENODEV);
 
        if (pci_enable_device(dev) < 0)
                return(-ENODEV);
 

-#ifdef CONFIG_HAVE_PCI_SET_MWI
+#ifdef HAVE_PCI_SET_MWI

        if (pci_set_mwi(dev))
                return(-ENODEV);
 #endif
        if (pci_set_mwi(dev))
                return(-ENODEV);
 #endif