From a791edaf103e811420c172c98adf6b92261dba1a Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 14 Oct 2009 12:43:49 +0200
Subject: [PATCH] --- yaml --- r: 167480 b: refs/heads/master c:
 d3acf71fb8daecc8ab8b1371d29d15df0c30a315 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/s390/char/sclp_async.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9441239e6f78..eabe0ec1d126 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9fa9441ed6e0467d7d41de730581874c997e658
+refs/heads/master: d3acf71fb8daecc8ab8b1371d29d15df0c30a315
diff --git a/trunk/drivers/s390/char/sclp_async.c b/trunk/drivers/s390/char/sclp_async.c
index daaec185ed36..a4f68e5b9c96 100644
--- a/trunk/drivers/s390/char/sclp_async.c
+++ b/trunk/drivers/s390/char/sclp_async.c
@@ -62,7 +62,7 @@ static struct notifier_block call_home_panic_nb = {
 	.priority = INT_MAX,
 };
 
-static int proc_handler_callhome(ctl_table *ctl, int write, struct file *filp,
+static int proc_handler_callhome(struct ctl_table *ctl, int write,
 				 void __user *buffer, size_t *count,
 				 loff_t *ppos)
 {
@@ -100,7 +100,7 @@ static struct ctl_table callhome_table[] = {
 	{
 		.procname	= "callhome",
 		.mode		= 0644,
-		.proc_handler	= &proc_handler_callhome,
+		.proc_handler	= proc_handler_callhome,
 	},
 	{ .ctl_name = 0 }
 };