diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:30 -0400 |
| commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
| tree | 2cad553a9def773ce79b8fc793f89c0634187109 /arch/blackfin/lib/outs.S | |
| parent | 89ccf465abe6b20d804a63ae20307970c441369d (diff) | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/lib/outs.S')
| -rw-r--r-- | arch/blackfin/lib/outs.S | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 4685b7aa0080..250f4d4b9436 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S | |||
| @@ -1,30 +1,11 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * File: arch/blackfin/lib/outs.S | 2 | * Implementation of outs{bwl} for BlackFin processors using zero overhead loops. |
| 3 | * Based on: | ||
| 4 | * Author: Bas Vermeulen <bas@buyways.nl> | ||
| 5 | * | 3 | * |
| 6 | * Created: Tue Mar 22 15:27:24 CEST 2005 | 4 | * Copyright 2005-2009 Analog Devices Inc. |
| 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. | 5 | * 2005 BuyWays BV |
| 6 | * Bas Vermeulen <bas@buyways.nl> | ||
| 8 | * | 7 | * |
| 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 8 | * Licensed under the GPL-2. |
| 10 | * Copyright 2004-2008 Analog Devices Inc. | ||
| 11 | * | ||
| 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify | ||
| 15 | * it under the terms of the GNU General Public License as published by | ||
| 16 | * the Free Software Foundation; either version 2 of the License, or | ||
| 17 | * (at your option) any later version. | ||
| 18 | * | ||
| 19 | * This program is distributed in the hope that it will be useful, | ||
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 22 | * GNU General Public License for more details. | ||
| 23 | * | ||
| 24 | * You should have received a copy of the GNU General Public License | ||
| 25 | * along with this program; if not, see the file COPYING, or write | ||
| 26 | * to the Free Software Foundation, Inc., | ||
| 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 28 | */ | 9 | */ |
| 29 | 10 | ||
| 30 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |