Fix compilation for 32-bit PowerPC on old kernels

32-bit PowerPC only gets iowrite32be() and ioread32be() in version
2.6.20.  This applies only to the merged "powerpc" architecture
identified by CONFIG_PPC_MERGE.  The old "ppc" architecture goes away in
Linux 2.6.27, so CONFIG_PPC_MERGE is no longer valid.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4029 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath_hal/ah_osdep.h b/ath_hal/ah_osdep.h
index abe60faf184c0d5f6e25eb69a41aa97328630ce3..d7027516f4289194fcd552793682ec47a3ccb7a3 100644 (file)
--- a/ath_hal/ah_osdep.h
+++ b/ath_hal/ah_osdep.h
@@ -152,7 +152,10 @@ struct ath_hal_rf *const *ah_rfs_ptrs[] = {                        \
     !defined(CONFIG_PARISC) && \
     !(defined(CONFIG_PPC64) && \
       (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))) && \
-    !defined(CONFIG_PPC_MERGE) && \
+    !(defined(CONFIG_PPC_MERGE) && \
+      (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))) && \
+    !(defined(CONFIG_PPC32) && \
+      (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))) && \
     !(defined(CONFIG_MIPS) && \
       (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)))
 # ifndef iowrite32be