From bd9cf20b135930aa1862a94fb5f2e07cadd30216 Mon Sep 17 00:00:00 2001 From: "s.hauer@pengutronix.de" Date: Thu, 2 Nov 2006 13:56:00 +0100 Subject: [PATCH] --- yaml --- r: 42191 b: refs/heads/master c: 67764a03193d0246cf9bb491b41806508d415830 h: refs/heads/master i: 42189: f0925463d9ed7d965a8d3d9fc54e0e7301a04261 42187: 2ce4a574465016306de2fa590de3463a21d0c3ab 42183: 86b1ba3a7db050f700722e37ed70e9e6a6975314 42175: 5c7eecb9f2f56940206dedb0918dc7c4ecfbe40d v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/pci.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3d5c0fc7b251..21ed6fa838f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b890bc2ce95e8c141b38ea86100826b46534295 +refs/heads/master: 67764a03193d0246cf9bb491b41806508d415830 diff --git a/trunk/include/asm-powerpc/pci.h b/trunk/include/asm-powerpc/pci.h index 46afd29b904e..051694f14c3e 100644 --- a/trunk/include/asm-powerpc/pci.h +++ b/trunk/include/asm-powerpc/pci.h @@ -238,12 +238,10 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, unsigned long size, pgprot_t prot); -#if defined(CONFIG_PPC_MULTIPLATFORM) || defined(CONFIG_PPC32) #define HAVE_ARCH_PCI_RESOURCE_TO_USER extern void pci_resource_to_user(const struct pci_dev *dev, int bar, const struct resource *rsrc, resource_size_t *start, resource_size_t *end); -#endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */ #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_PCI_H */