i=liangzhen

[fs/lustre-release.git] / lnet / klnds / qswlnd / qswlnd.h

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index 0fe2a5e..452959f 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -30,8 +30,9 @@
 
 #include <qsnet/kernel.h>
 #undef printf                                   /* nasty QSW #define */
-
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
+#endif
 #include <linux/module.h>
 
 #include <elan/epcomms.h>
@@ -241,8 +242,8 @@ typedef struct
         int               *kqn_inject_csum_error; /* # csum errors to inject */
 #endif
 
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
-        struct ctl_table_header *kqn_sysctl;    /* sysctl interface */
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
+        cfs_sysctl_table_header_t *kqn_sysctl;  /* sysctl interface */
 #endif
 } kqswnal_tunables_t;