Search Linux Wireless

[PATCH] Fix incorrect conditional nesting, that prevented inclusion of compat symbols.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Kernels 2.6.23 or above didn't get these symbols:
device_create_vargs
device_create_drvdata
register_rfkill_notifier
unregister_rfkill_notifier
rfkill_force_state

Also fix a related comment typo found checking compat/compat.h .
---
 compat/compat.c |    6 +++---
 compat/compat.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compat/compat.c b/compat/compat.c
index b1ec4d4..84e3ab3 100644
--- a/compat/compat.c
+++ b/compat/compat.c
@@ -640,6 +640,8 @@ int pci_try_set_mwi(struct pci_dev *dev)
 EXPORT_SYMBOL(pci_try_set_mwi);
 #endif
 
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) */
+
 /* All things not in 2.6.25 */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
 
@@ -744,7 +746,7 @@ struct device *device_create_drvdata(struct class *class,
 	return dev;
 }
 EXPORT_SYMBOL_GPL(device_create_drvdata);
-#endif
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
 
@@ -839,5 +841,3 @@ EXPORT_SYMBOL(rfkill_force_state);
 
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) */
-
diff --git a/compat/compat.h b/compat/compat.h
index ec50750..75a498e 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -441,7 +441,7 @@ static inline void set_freezable(void) {}
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
 /* Added on 2.6.24 in include/linux/types.h by Al viro on commit 142956af */
 typedef unsigned long               uintptr_t;
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) */
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) */
 
 
 
-- 
1.6.0.rc1.64.g61192

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux