summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-06-05 10:46:48 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-06-05 10:46:48 +1000
commit6d98675408808792b2939bd5c7195774a17df79f (patch)
tree6da10cbfcf7973fd8cc22909186aa9899fbe0d46 /include
parentae21db640e8e80be26556a3f950315d0a13f2bb8 (diff)
ide-{floppy,tape}: merge pc->idefloppy_callback and pc->idetape_callback
Merge pc->idefloppy_callback and pc->idetape_callback into pc->callback. There should be no functional changes caused by this patch. Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 708be865896a..7cfaa7435ae4 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -625,8 +625,8 @@ struct ide_atapi_pc {
* to change/removal later.
*/
u8 pc_buf[256];
- void (*idefloppy_callback) (ide_drive_t *);
- void (*idetape_callback) (ide_drive_t *);
+
+ void (*callback)(ide_drive_t *);
/* idetape only */
struct idetape_bh *bh;