summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/dma.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-06 17:31:30 -0500
committerLen Brown <len.brown@intel.com>2005-12-06 17:31:30 -0500
commit3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch)
treeab8a881a14478598a0c8bda0d26c62cdccfffd6d /include/asm-sparc/dma.h
parent378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff)
parent9115a6c787596e687df03010d97fccc5e0762506 (diff)
downloadkernel-crypto-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.gz
kernel-crypto-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.xz
kernel-crypto-3d5271f9883cba7b54762bc4fe027d4172f06db7.zip
Pull release into acpica branch
Diffstat (limited to 'include/asm-sparc/dma.h')
-rw-r--r--include/asm-sparc/dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/dma.h b/include/asm-sparc/dma.h
index 07e6368a252..8ec206aa5f2 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 ;) */