From: Bastian Blank <bastian@waldi.eu.org>

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/s390/block/dasd_ioctl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/s390/block/dasd_ioctl.c~dasd-cleanup-dasd_ioctl-fix drivers/s390/block/dasd_ioctl.c
--- devel/drivers/s390/block/dasd_ioctl.c~dasd-cleanup-dasd_ioctl-fix	2006-02-12 13:36:55.000000000 -0800
+++ devel-akpm/drivers/s390/block/dasd_ioctl.c	2006-02-12 13:36:55.000000000 -0800
@@ -81,7 +81,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);
 }
 
 /*
_