diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:31:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:31:47 -0700 |
| commit | 79a6f564401f1d47989e706d47053a650f296966 (patch) | |
| tree | 933d892e4a23220e2cadb9d972187c0668684821 /arch/blackfin/include/asm/dma-mapping.h | |
| parent | 7f3143702cc0d433c183d7b361b1316f2dcf8464 (diff) | |
| parent | 796dada9f5584a677a0a2a1972090bfc538903ff (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: convert to GENERIC_HARDIRQS_NO__DO_IRQ
Blackfin: drop all simple-gpio board resources
Blackfin: fix framebuffer mmap bug for nommu
Blackfin: includecheck fix: mach-bf548, ezkit.c
Blackfin: drop cs_change_per_word setting
Blackfin: bf533-ezkit: convert to physmap/jedec_probe
Blackfin: convert adv7393 resources to new i2c framework
Blackfin: fix missed cache config renames
Blackfin: cplbinfo: drop d_path() hacks
Blackfin: asm/irq.h: pull in mach/anomaly.h for anomaly defines
Blackfin: BF51x: add PTP MMR defines
Blackfin: mass clean up of copyright/licensing info
Blackfin: convert to use arch_gettimeoffset()
Diffstat (limited to 'arch/blackfin/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/blackfin/include/asm/dma-mapping.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index ed6b1f3cccc..7a23d824ac9 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_DMA_MAPPING_H #define _BLACKFIN_DMA_MAPPING_H |