aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 16:08:52 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-15 16:08:52 -0400
commitf6f88e9bfb6ced9871ed65ebe85c371de3c9e4be (patch)
treefec0def5fed9ab79340a04184bc4d48ac2b832ce /drivers/watchdog
parentb3c9816b9fa9a7b75ab36111eb76eca03e5bab78 (diff)
generic-ipi: more merge fallout
fix more API change fallout in recently merged upstream changes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/booke_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index c1ba0db48501..770824458d45 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data)
55 55
56static void booke_wdt_ping(void) 56static void booke_wdt_ping(void)
57{ 57{
58 on_each_cpu(__booke_wdt_ping, NULL, 0, 0); 58 on_each_cpu(__booke_wdt_ping, NULL, 0);
59} 59}
60 60
61static void __booke_wdt_enable(void *data) 61static void __booke_wdt_enable(void *data)
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
131 spin_lock(&booke_wdt_lock); 131 spin_lock(&booke_wdt_lock);
132 if (booke_wdt_enabled == 0) { 132 if (booke_wdt_enabled == 0) {
133 booke_wdt_enabled = 1; 133 booke_wdt_enabled = 1;
134 on_each_cpu(__booke_wdt_enable, NULL, 0, 0); 134 on_each_cpu(__booke_wdt_enable, NULL, 0);
135 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " 135 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
136 "(wdt_period=%d)\n", booke_wdt_period); 136 "(wdt_period=%d)\n", booke_wdt_period);
137 } 137 }
@@ -177,7 +177,7 @@ static int __init booke_wdt_init(void)
177 if (booke_wdt_enabled == 1) { 177 if (booke_wdt_enabled == 1) {
178 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " 178 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
179 "(wdt_period=%d)\n", booke_wdt_period); 179 "(wdt_period=%d)\n", booke_wdt_period);
180 on_each_cpu(__booke_wdt_enable, NULL, 0, 0); 180 on_each_cpu(__booke_wdt_enable, NULL, 0);
181 } 181 }
182 spin_unlock(&booke_wdt_lock); 182 spin_unlock(&booke_wdt_lock);
183 183