git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[pandora-kernel.git]
/
drivers
/
ide
/
ide-floppy.h
diff --git
a/drivers/ide/ide-floppy.h
b/drivers/ide/ide-floppy.h
index
c17124d
..
6dd2beb
100644
(file)
--- a/
drivers/ide/ide-floppy.h
+++ b/
drivers/ide/ide-floppy.h
@@
-23,8
+23,8
@@
void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *, u8);
void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *);
/* ide-floppy_ioctl.c */
void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *);
/* ide-floppy_ioctl.c */
-int ide_floppy_ioctl(ide_drive_t *, struct
inode *, struct file *, unsigned in
t,
- unsigned long);
+int ide_floppy_ioctl(ide_drive_t *, struct
block_device *, fmode_
t,
+ unsigned
int, unsigned
long);
#ifdef CONFIG_IDE_PROC_FS
/* ide-floppy_proc.c */
#ifdef CONFIG_IDE_PROC_FS
/* ide-floppy_proc.c */