OSDN Git Service

microblaze: Drop architecture-specific declaration of early_printk
authorGuenter Roeck <linux@roeck-us.net>
Mon, 17 Feb 2014 17:44:19 +0000 (09:44 -0800)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 12 Mar 2014 09:10:07 +0000 (10:10 +0100)
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>
arch/microblaze/include/asm/setup.h

index 0990b43..be84a4d 100644 (file)
@@ -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);