aboutsummaryrefslogtreecommitdiff
path: root/arch/blackfin/include/asm/bfin_rotary.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-09 13:31:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-09 13:31:47 -0700
commit79a6f564401f1d47989e706d47053a650f296966 (patch)
tree933d892e4a23220e2cadb9d972187c0668684821 /arch/blackfin/include/asm/bfin_rotary.h
parent7f3143702cc0d433c183d7b361b1316f2dcf8464 (diff)
parent796dada9f5584a677a0a2a1972090bfc538903ff (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/bfin_rotary.h')
-rw-r--r--arch/blackfin/include/asm/bfin_rotary.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/arch/blackfin/include/asm/bfin_rotary.h
index 425ece64fd5..abdb2af5290 100644
--- a/arch/blackfin/include/asm/bfin_rotary.h
+++ b/arch/blackfin/include/asm/bfin_rotary.h
@@ -1,6 +1,10 @@
/*
* board initialization should put one of these structures into platform_data
* and place the bfin-rotary onto platform_bus named "bfin-rotary".
+ *
+ * Copyright 2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
*/
#ifndef _BFIN_ROTARY_H