diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/asm-m68k/dma.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/asm-m68k/dma.h')
| -rw-r--r-- | include/asm-m68k/dma.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-m68k/dma.h b/include/asm-m68k/dma.h deleted file mode 100644 index 4240fbc946f8..000000000000 --- a/include/asm-m68k/dma.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | #ifndef _M68K_DMA_H | ||
| 2 | #define _M68K_DMA_H 1 | ||
| 3 | |||
| 4 | |||
| 5 | /* it's useless on the m68k, but unfortunately needed by the new | ||
| 6 | bootmem allocator (but this should do it for this) */ | ||
| 7 | #define MAX_DMA_ADDRESS PAGE_OFFSET | ||
| 8 | |||
| 9 | #define MAX_DMA_CHANNELS 8 | ||
| 10 | |||
| 11 | extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ | ||
| 12 | extern void free_dma(unsigned int dmanr); /* release it again */ | ||
| 13 | |||
| 14 | #define isa_dma_bridge_buggy (0) | ||
| 15 | |||
| 16 | #endif /* _M68K_DMA_H */ | ||