diff options
author | Guenter Roeck <linux@roeck-us.net> | 2014-02-17 22:46:54 -0800 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-03-12 10:10:06 +0100 |
commit | 79c157a3fbaacd6b327f0433957767fe053d0d78 (patch) | |
tree | 5ad317f47c62748d0acac57cc1df6776c2cb582f /arch/microblaze/include/asm/setup.h | |
parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
download | op-kernel-dev-79c157a3fbaacd6b327f0433957767fe053d0d78.zip op-kernel-dev-79c157a3fbaacd6b327f0433957767fe053d0d78.tar.gz |
microblaze: Rename global function heartbeat()
microblaze:allmodconfig complains for some configurations that 'heartbeat'
is redefined as different kind of symbol. This is seen in test compiles
of watchdog drivers, which often use 'heartbeat' as ststic variable.
Since 'heartbeat' is an unfortunate name for a global function,
rename it to microblaze_heartbeat. Also rename the setup function
to microblaze_setup_heartbeat.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/include/asm/setup.h')
-rw-r--r-- | arch/microblaze/include/asm/setup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index f05df56..0990b43 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -25,8 +25,8 @@ int setup_early_printk(char *opt); void remap_early_printk(void); void disable_early_printk(void); -void heartbeat(void); -void setup_heartbeat(void); +void microblaze_heartbeat(void); +void microblaze_setup_heartbeat(void); # ifdef CONFIG_MMU extern void mmu_reset(void); |