aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/m8260_pci_erratum9.c
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-05-31 14:32:44 -0700
committerSteve French <sfrench@hera.kernel.org>2005-05-31 14:32:44 -0700
commitaf6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch)
tree87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /arch/ppc/syslib/m8260_pci_erratum9.c
parent7e2987503dda95a5f80290bb8c06279009c2419e (diff)
parent2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff)
downloadkernel_samsung_smdk4412-af6f5e3247a68074e384ef93c0b4bce1b73c9d80.zip
kernel_samsung_smdk4412-af6f5e3247a68074e384ef93c0b4bce1b73c9d80.tar.gz
kernel_samsung_smdk4412-af6f5e3247a68074e384ef93c0b4bce1b73c9d80.tar.bz2
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc/syslib/m8260_pci_erratum9.c')
-rw-r--r--arch/ppc/syslib/m8260_pci_erratum9.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
index 9c0582d..1dc7e4e 100644
--- a/arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c
@@ -31,7 +31,7 @@
#include <asm/immap_cpm2.h>
#include <asm/cpm2.h>
-#include "m8260_pci.h"
+#include "m82xx_pci.h"
#ifdef CONFIG_8260_PCI9
/*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
@@ -248,11 +248,11 @@ EXPORT_SYMBOL(idma_pci9_read_le);
static inline int is_pci_mem(unsigned long addr)
{
- if (addr >= MPC826x_PCI_LOWER_MMIO &&
- addr <= MPC826x_PCI_UPPER_MMIO)
+ if (addr >= M82xx_PCI_LOWER_MMIO &&
+ addr <= M82xx_PCI_UPPER_MMIO)
return 1;
- if (addr >= MPC826x_PCI_LOWER_MEM &&
- addr <= MPC826x_PCI_UPPER_MEM)
+ if (addr >= M82xx_PCI_LOWER_MEM &&
+ addr <= M82xx_PCI_UPPER_MEM)
return 1;
return 0;
}