diff options
author | David Howells <dhowells@redhat.com> | 2006-01-08 04:01:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:38 -0500 |
commit | 41be6aef38c08f1f85ac1c4bd8191b0d1ec61b4c (patch) | |
tree | 50c3cca13c3c069fb2061bcf324ff553128c6700 /include/asm-frv/pci.h | |
parent | 5c15d41bab185431a9a28982b5aaac251dde4556 (diff) |
[PATCH] frv: miscellaneous changes
Fix a number of miscellanous items:
(1) Declare lock sections in the linker script.
(2) Recurse in the correct manner in the arch makefile.
(3) asm/bug.h requires asm/linkage.h to be included first. One C file puts
asm/bug.h first.
(4) Add an empty RTC header file to avoid missing header file errors.
(5) sg_dma_address() should use the dma_address member of a scatter list.
(6) Add trivial pci_unmap support.
(7) Add pgprot_noncached()
(8) Discard u_quad_t.
(9) Use ~0UL rather than ULONG_MAX in unistd.h in case the latter isn't
declared.
(10) Add an empty VGA header file to avoid missing header file errors.
(11) Add an XOR header file to use the generic XOR stuff.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-frv/pci.h')
-rw-r--r-- | include/asm-frv/pci.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h index 1168451c275f..598b0c6b695d 100644 --- a/include/asm-frv/pci.h +++ b/include/asm-frv/pci.h | |||
@@ -57,6 +57,14 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, | |||
57 | */ | 57 | */ |
58 | #define PCI_DMA_BUS_IS_PHYS (1) | 58 | #define PCI_DMA_BUS_IS_PHYS (1) |
59 | 59 | ||
60 | /* pci_unmap_{page,single} is a nop so... */ | ||
61 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
62 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
63 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
64 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
65 | #define pci_unmap_len(PTR, LEN_NAME) (0) | ||
66 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
67 | |||
60 | #ifdef CONFIG_PCI | 68 | #ifdef CONFIG_PCI |
61 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 69 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
62 | enum pci_dma_burst_strategy *strat, | 70 | enum pci_dma_burst_strategy *strat, |