projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
[powerpc.git]
/
include
/
asm-sparc64
/
parport.h
diff --git
a/include/asm-sparc64/parport.h
b/include/asm-sparc64/parport.h
index
b7e6355
..
56b5197
100644
(file)
--- a/
include/asm-sparc64/parport.h
+++ b/
include/asm-sparc64/parport.h
@@
-27,12
+27,12
@@
static struct sparc_ebus_info {
static __inline__ void enable_dma(unsigned int dmanr)
{
static __inline__ void enable_dma(unsigned int dmanr)
{
+ ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
+
if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
sparc_ebus_dmas[dmanr].addr,
sparc_ebus_dmas[dmanr].count))
BUG();
if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
sparc_ebus_dmas[dmanr].addr,
sparc_ebus_dmas[dmanr].count))
BUG();
-
- ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
}
static __inline__ void disable_dma(unsigned int dmanr)
}
static __inline__ void disable_dma(unsigned int dmanr)