diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 20:28:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 20:28:31 -0500 |
| commit | 132a69c6cc3dfa7fa354a88128acee7e6ee7082b (patch) | |
| tree | be77ed97c9c94cbcc9931c58ce1a061e9dc26755 /include/asm-sparc64/dma.h | |
| parent | fb7d4045669b3ea0e92cf45963839a9808b7650c (diff) | |
| parent | 74bd7d093b8e87f35eaf3b14459b96a0e20d1d10 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix parport_pc build.
[SPARC64]: Update defconfig.
Diffstat (limited to 'include/asm-sparc64/dma.h')
| -rw-r--r-- | include/asm-sparc64/dma.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index 93e5a062df8..1bf4f7a8fbe 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h | |||
| @@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \ | |||
| 205 | #define for_each_dvma(dma) \ | 205 | #define for_each_dvma(dma) \ |
| 206 | for((dma) = dma_chain; (dma); (dma) = (dma)->next) | 206 | for((dma) = dma_chain; (dma); (dma) = (dma)->next) |
| 207 | 207 | ||
| 208 | extern int get_dma_list(char *); | ||
| 209 | extern int request_dma(unsigned int, __const__ char *); | ||
| 210 | extern void free_dma(unsigned int); | ||
| 211 | |||
| 212 | /* From PCI */ | 208 | /* From PCI */ |
| 213 | 209 | ||
| 214 | #ifdef CONFIG_PCI | 210 | #ifdef CONFIG_PCI |