diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/frv/include/asm/pci.h | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/frv/include/asm/pci.h')
| -rw-r--r-- | arch/frv/include/asm/pci.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index 8c7260a3cd4..0d599790985 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h | |||
| @@ -43,14 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, | |||
| 43 | /* Return the index of the PCI controller for device PDEV. */ | 43 | /* Return the index of the PCI controller for device PDEV. */ |
| 44 | #define pci_controller_num(PDEV) (0) | 44 | #define pci_controller_num(PDEV) (0) |
| 45 | 45 | ||
| 46 | /* pci_unmap_{page,single} is a nop so... */ | ||
| 47 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
| 48 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
| 49 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
| 50 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
| 51 | #define pci_unmap_len(PTR, LEN_NAME) (0) | ||
| 52 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
| 53 | |||
| 54 | #ifdef CONFIG_PCI | 46 | #ifdef CONFIG_PCI |
| 55 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 47 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
| 56 | enum pci_dma_burst_strategy *strat, | 48 | enum pci_dma_burst_strategy *strat, |