summaryrefslogtreecommitdiff
path: root/arch/microblaze/kernel/heartbeat.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-02-18 10:46:54 +0400
committerMichal Simek <michal.simek@xilinx.com>2014-03-12 13:10:06 +0400
commit79c157a3fbaacd6b327f0433957767fe053d0d78 (patch)
tree5ad317f47c62748d0acac57cc1df6776c2cb582f /arch/microblaze/kernel/heartbeat.c
parentfa389e220254c69ffae0d403eac4146171062d08 (diff)
downloadlinux-79c157a3fbaacd6b327f0433957767fe053d0d78.tar.xz
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/kernel/heartbeat.c')
-rw-r--r--arch/microblaze/kernel/heartbeat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c
index 1879a0527776..4643e3ab9414 100644
--- a/arch/microblaze/kernel/heartbeat.c
+++ b/arch/microblaze/kernel/heartbeat.c
@@ -17,7 +17,7 @@
static unsigned int base_addr;
-void heartbeat(void)
+void microblaze_heartbeat(void)
{
static unsigned int cnt, period, dist;
@@ -42,7 +42,7 @@ void heartbeat(void)
}
}
-void setup_heartbeat(void)
+void microblaze_setup_heartbeat(void)
{
struct device_node *gpio = NULL;
int *prop;