diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2014-02-17 18:44:19 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-03-12 10:10:07 +0100 |
| commit | 1b3fe856bd53bc1290ef77a0cce75424b81bdc19 (patch) | |
| tree | 6282267a266ce4f2ccc13193f717b5a53b76934f /arch | |
| parent | microblaze: Rename global function heartbeat() (diff) | |
| download | linux-1b3fe856bd53bc1290ef77a0cce75424b81bdc19.tar.xz linux-1b3fe856bd53bc1290ef77a0cce75424b81bdc19.zip | |
microblaze: Drop architecture-specific declaration of early_printk
miceroblaze:allmodconfig fails to build, complaining that
early_printk is redeclared.
include/linux/printk.h:114:6: error: static declaration of 'early_printk'
follows non-static declaration
void early_printk(const char *s, ...) { }
^
In file included from arch/microblaze/include/asm/page.h:19:0,
from arch/microblaze/include/asm/io.h:15,
from include/linux/io.h:22,
from kernel/irq/generic-chip.c:6:
arch/microblaze/include/asm/setup.h:22:6:
note: previous declaration of 'early_printk' was here
void early_printk(const char *fmt, ...);
This happens because CONFIG_EARLY_PRINTK is not enabled in this
configuration.
The architecture-specific declaration is not needed; drop it.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/include/asm/setup.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index 0990b436be51..be84a4d3917f 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -19,8 +19,6 @@ extern char cmd_line[COMMAND_LINE_SIZE]; extern char *klimit; -void early_printk(const char *fmt, ...); - int setup_early_printk(char *opt); void remap_early_printk(void); void disable_early_printk(void); |