diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 09:06:21 +0200 |
commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-m68k/apollodma.h | |
parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
download | op-kernel-dev-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip op-kernel-dev-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz |
Merge branch 'linus' into x86/x2apic
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 |