Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm

[linux.git] / drivers / block / xd.h

diff --git a/drivers/block/xd.h b/drivers/block/xd.h
index cffd44a2038325078d306a5c940862e3c1f75927..37cacef16e936d87fbfe2d07980431f885971d81 100644 (file)
--- a/drivers/block/xd.h
+++ b/drivers/block/xd.h
@@ -105,7 +105,7 @@ static u_char xd_detect (u_char *controller, unsigned int *address);
 static u_char xd_initdrives (void (*init_drive)(u_char drive));
 
 static void do_xd_request (struct request_queue * q);
-static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);
+static int xd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);
 static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);
 static void xd_recalibrate (u_char drive);