From: Mikael Starvik on 10 Feb 2010 01:20 Sure, that is ok. Signed-off-by: Mikael Starvik <starvik(a)axis.com> -----Original Message----- From: FUJITA Tomonori [mailto:fujita.tomonori(a)lab.ntt.co.jp] Sent: den 10 februari 2010 02:35 To: linux-kernel(a)vger.kernel.org Cc: akpm(a)linux-foundation.org; fujita.tomonori(a)lab.ntt.co.jp; Mikael Starvik Subject: [PATCH v2 -mm 13/14] cris: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp> Cc: Mikael Starvik <starvik(a)axis.com> --- arch/cris/include/asm/pci.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h index 730ce40..43cfa0c 100644 --- a/arch/cris/include/asm/pci.h +++ b/arch/cris/include/asm/pci.h @@ -44,13 +44,7 @@ struct pci_dev; */ #define PCI_DMA_BUS_IS_PHYS (1) -/* pci_unmap_{page,single} is a nop so... */ -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) -#define pci_unmap_addr(PTR, ADDR_NAME) (0) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define pci_unmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) +#include <linux/pci-dma.h> #define HAVE_PCI_MMAP extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|
Pages: 1 Prev: PPC: Possible bug in prom_parse.c:of_irq_map_raw? Next: adds include/linux/pci-dma.h |