From 97b4d431f76471bd284895ca5b473c872679bb5f Mon Sep 17 00:00:00 2001 From: proski Date: Sun, 24 May 2009 06:30:27 +0000 Subject: [PATCH] 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 --- ath_hal/ah_osdep.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ath_hal/ah_osdep.h b/ath_hal/ah_osdep.h index abe60fa..d702751 100644 --- 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 -- 2.35.1