diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 11:16:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 11:16:14 -0400 |
| commit | c4052da6f0c01a0b059d125d72bb934d0980b798 (patch) | |
| tree | ad50a17e4d14b8f6f1773158d956d424575d1712 /include/asm-sparc/dma.h | |
| parent | cedc9a478d8c6265879dc3839ef3d4849a709184 (diff) | |
| parent | 3d3467f0fdf61a421361c00cf84fcf0f1a6dc1e8 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-sparc/dma.h')
| -rw-r--r-- | include/asm-sparc/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/dma.h b/include/asm-sparc/dma.h index 07e6368a2521..8ec206aa5f2e 100644 --- a/include/asm-sparc/dma.h +++ b/include/asm-sparc/dma.h @@ -198,7 +198,7 @@ extern void dvma_init(struct sbus_bus *); /* Pause until counter runs out or BIT isn't set in the DMA condition * register. */ -extern __inline__ void sparc_dma_pause(struct sparc_dma_registers *regs, +static inline void sparc_dma_pause(struct sparc_dma_registers *regs, unsigned long bit) { int ctr = 50000; /* Let's find some bugs ;) */ |