diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:20 -0400 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /arch/blackfin/mach-common/ints-priority.c | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-common/ints-priority.c')
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 6ffda78aaf9d..660ea1bec54c 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
| @@ -1,33 +1,14 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * File: arch/blackfin/mach-common/ints-priority.c | 2 | * Set up the interrupt priorities |
| 3 | * | 3 | * |
| 4 | * Description: Set up the interrupt priorities | 4 | * Copyright 2004-2009 Analog Devices Inc. |
| 5 | * 2003 Bas Vermeulen <bas@buyways.nl> | ||
| 6 | * 2002 Arcturus Networks Inc. MaTed <mated@sympatico.ca> | ||
| 7 | * 2000-2001 Lineo, Inc. D. Jefff Dionne <jeff@lineo.ca> | ||
| 8 | * 1999 D. Jeff Dionne <jeff@uclinux.org> | ||
| 9 | * 1996 Roman Zippel | ||
| 5 | * | 10 | * |
| 6 | * Modified: | 11 | * Licensed under the GPL-2 |
| 7 | * 1996 Roman Zippel | ||
| 8 | * 1999 D. Jeff Dionne <jeff@uclinux.org> | ||
| 9 | * 2000-2001 Lineo, Inc. D. Jefff Dionne <jeff@lineo.ca> | ||
| 10 | * 2002 Arcturus Networks Inc. MaTed <mated@sympatico.ca> | ||
| 11 | * 2003 Metrowerks/Motorola | ||
| 12 | * 2003 Bas Vermeulen <bas@buyways.nl> | ||
| 13 | * Copyright 2004-2008 Analog Devices Inc. | ||
| 14 | * | ||
| 15 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
| 16 | * | ||
| 17 | * This program is free software; you can redistribute it and/or modify | ||
| 18 | * it under the terms of the GNU General Public License as published by | ||
| 19 | * the Free Software Foundation; either version 2 of the License, or | ||
| 20 | * (at your option) any later version. | ||
| 21 | * | ||
| 22 | * This program is distributed in the hope that it will be useful, | ||
| 23 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 24 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 25 | * GNU General Public License for more details. | ||
| 26 | * | ||
| 27 | * You should have received a copy of the GNU General Public License | ||
| 28 | * along with this program; if not, see the file COPYING, or write | ||
| 29 | * to the Free Software Foundation, Inc., | ||
| 30 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 31 | */ | 12 | */ |
| 32 | 13 | ||
| 33 | #include <linux/module.h> | 14 | #include <linux/module.h> |