mac80211: merge latest changes from trunk (as of r29296)

[openwrt-10.03/.git] / package / mac80211 / patches / 022-atomic64_backport.patch

diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch
index 2d11a9f783c11903f3b740c4648f5a37a883a2c2..673b7c336a6b5a3777718cf8e66f51a458b4489a 100644 (file)
--- a/package/mac80211/patches/022-atomic64_backport.patch
+++ b/package/mac80211/patches/022-atomic64_backport.patch
@@ -38,7 +38,7 @@
 +#include <linux/spinlock.h>
 +#include <linux/module.h>
 +
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT) && !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
++#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && (defined(CONFIG_UML) || defined(CONFIG_X86))) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
 +
 +static DEFINE_SPINLOCK(lock);
 +