From 94ccb86cbde474da28c43e1d5e1faf0a819710af Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 17 May 2007 06:22:41 +0100 Subject: [PATCH] --- yaml --- r: 56691 b: refs/heads/master c: 95ba71f76f1cce550cb2e2b345a204d4a926d29c h: refs/heads/master i: 56689: f001136adac9ae1ccacb149cca5db772d5efe761 56687: c11232348671afedff82e1b07642adf5b214169a v: v3 --- [refs] | 2 +- trunk/include/asm-arm/io.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cfa6038b5425..bb62258eea0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d28bff7c4ea138032b44d514351b7caceb9fba5 +refs/heads/master: 95ba71f76f1cce550cb2e2b345a204d4a926d29c diff --git a/trunk/include/asm-arm/io.h b/trunk/include/asm-arm/io.h index 8261ff9e7955..1d3caa42a386 100644 --- a/trunk/include/asm-arm/io.h +++ b/trunk/include/asm-arm/io.h @@ -259,9 +259,11 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); #define BIOVEC_MERGEABLE(vec1, vec2) \ ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) +#ifdef CONFIG_MMU #define ARCH_HAS_VALID_PHYS_ADDR_RANGE extern int valid_phys_addr_range(unsigned long addr, size_t size); extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); +#endif /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem