git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sparc
/
dma.h
diff --git
a/include/asm-sparc/dma.h
b/include/asm-sparc/dma.h
index
07e6368
..
407b361
100644
(file)
--- a/
include/asm-sparc/dma.h
+++ b/
include/asm-sparc/dma.h
@@
-7,7
+7,6
@@
#ifndef _ASM_SPARC_DMA_H
#define _ASM_SPARC_DMA_H
#ifndef _ASM_SPARC_DMA_H
#define _ASM_SPARC_DMA_H
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-198,7
+197,7
@@
extern void dvma_init(struct sbus_bus *);
/* Pause until counter runs out or BIT isn't set in the DMA condition
* register.
*/
/* 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 ;) */
unsigned long bit)
{
int ctr = 50000; /* Let's find some bugs ;) */