From fbe6f2557c81be17ec01405d47b236a0de9533f5 Mon Sep 17 00:00:00 2001
From: Bastian Blank <bastian@waldi.eu.org>
Date: Fri, 24 Mar 2006 03:15:32 -0800
Subject: [PATCH] --- yaml --- r: 23386 b: refs/heads/master c:
 b5029622ac86bb441dc5e641226fb1152fca02d7 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/s390/block/dasd_ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc199809792a..1e1234ab9dd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88abaab4f9b08381e30e737980a1c49d6b524dfc
+refs/heads/master: b5029622ac86bb441dc5e641226fb1152fca02d7
diff --git a/trunk/drivers/s390/block/dasd_ioctl.c b/trunk/drivers/s390/block/dasd_ioctl.c
index d0c2d732dcff..b8c80d28df41 100644
--- a/trunk/drivers/s390/block/dasd_ioctl.c
+++ b/trunk/drivers/s390/block/dasd_ioctl.c
@@ -29,7 +29,7 @@ static int
 dasd_ioctl_api_version(void __user *argp)
 {
 	int ver = DASD_API_VERSION;
-	return put_user(ver, (int *)argp);
+	return put_user(ver, (int __user *)argp);
 }
 
 /*