diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /include/asm-blackfin/early_printk.h | |
parent | ab7476cf76e560f0efda2a631a70aabe93009025 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-blackfin/early_printk.h')
-rw-r--r-- | include/asm-blackfin/early_printk.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/asm-blackfin/early_printk.h b/include/asm-blackfin/early_printk.h deleted file mode 100644 index 110f1c1f845..00000000000 --- a/include/asm-blackfin/early_printk.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * File: include/asm-blackfin/early_printk.h - * Author: Robin Getz <rgetz@blackfin.uclinux.org - * - * Created: 14Aug2007 - * Description: function prototpyes for early printk - * - * Modified: - * Copyright 2004-2007 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifdef CONFIG_EARLY_PRINTK -extern int setup_early_printk(char *); -#else -#define setup_early_printk(fmt) do { } while (0) -#endif /* CONFIG_EARLY_PRINTK */ |