diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /include/asm-m68k/apollodma.h | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | op-kernel-dev-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.zip op-kernel-dev-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.tar.gz | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/asm-m68k/apollodma.h')
| -rw-r--r-- | include/asm-m68k/apollodma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/apollodma.h b/include/asm-m68k/apollodma.h index 6821e3b..954adc8 100644 --- a/include/asm-m68k/apollodma.h +++ b/include/asm-m68k/apollodma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.7 1992/12/14 00:29:34 root Exp root $ +/* * linux/include/asm/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. * High DMA channel support & info by Hannu Savolainen |
