diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-m68k/dma.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-m68k/dma.h')
| -rw-r--r-- | include/asm-m68k/dma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68k/dma.h b/include/asm-m68k/dma.h index d5266a886226..d0c9e61e57b4 100644 --- a/include/asm-m68k/dma.h +++ b/include/asm-m68k/dma.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_DMA_H | 1 | #ifndef _M68K_DMA_H |
| 2 | #define _M68K_DMA_H 1 | 2 | #define _M68K_DMA_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* it's useless on the m68k, but unfortunately needed by the new | 5 | /* it's useless on the m68k, but unfortunately needed by the new |
| 7 | bootmem allocator (but this should do it for this) */ | 6 | bootmem allocator (but this should do it for this) */ |