diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
| commit | c101f3136cc98a003d0d16be6fab7d0d950581a6 (patch) | |
| tree | 738f3ea3ff68245fb0900aeeeb73f1accb2bf956 /include | |
| parent | 359ea2f1352a77177540a213283bc7489f546ced (diff) | |
| parent | e3e01d6005ab4b0877f1fb3efef7f5b745e743be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/parport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h index b7e635544cec..56b5197d7898 100644 --- a/include/asm-sparc64/parport.h +++ b/include/asm-sparc64/parport.h | |||
| @@ -27,12 +27,12 @@ static struct sparc_ebus_info { | |||
| 27 | 27 | ||
| 28 | static __inline__ void enable_dma(unsigned int dmanr) | 28 | static __inline__ void enable_dma(unsigned int dmanr) |
| 29 | { | 29 | { |
| 30 | ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1); | ||
| 31 | |||
| 30 | if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info, | 32 | if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info, |
| 31 | sparc_ebus_dmas[dmanr].addr, | 33 | sparc_ebus_dmas[dmanr].addr, |
| 32 | sparc_ebus_dmas[dmanr].count)) | 34 | sparc_ebus_dmas[dmanr].count)) |
| 33 | BUG(); | 35 | BUG(); |
| 34 | |||
| 35 | ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1); | ||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | static __inline__ void disable_dma(unsigned int dmanr) | 38 | static __inline__ void disable_dma(unsigned int dmanr) |