[Madwifi-cvs] revision 4029 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 4029
Author      : proski (Pavel Roskin)
Date        : 2009-05-24 08:30:27 +0200 (Sun, 24 May 2009)

Log Message :
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.

Affected Files:
* madwifi/trunk/ath_hal/ah_osdep.h                    updated             


Modified: madwifi/trunk/ath_hal/ah_osdep.h
===================================================================
--- madwifi/trunk/ath_hal/ah_osdep.h	2009-05-24 06:14:18 UTC (rev 4028)
+++ madwifi/trunk/ath_hal/ah_osdep.h	2009-05-24 06:30:27 UTC (rev 4029)
@@ -152,7 +152,10 @@
     !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