package/mac80211: merge r29209 (fix atomic64 compat)

SVN-Revision: 29210

diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch
index ab77f76ad0207b06128598e7e8667b3bade7c3d0..2d11a9f783c11903f3b740c4648f5a37a883a2c2 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 !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(ATOMIC64_INIT) && !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
 +
 +static DEFINE_SPINLOCK(lock);
 +