diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:56 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:56 -0400 |
commit | 1b06e92aa03018e4b3ba281e03a7711d9b71a998 (patch) | |
tree | 636b1d90f44270253f3834684b85e902f638a21a /include/linux | |
parent | 81f4938239fea86d0a7529194a37fb81041171e0 (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/linux')
-rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 8936b21a7030..f079456adfdb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -640,8 +640,8 @@ struct ide_atapi_pc { | |||
640 | * to change/removal later. | 640 | * to change/removal later. |
641 | */ | 641 | */ |
642 | u8 pc_buf[256]; | 642 | u8 pc_buf[256]; |
643 | void (*idefloppy_callback) (ide_drive_t *); | 643 | |
644 | void (*idetape_callback) (ide_drive_t *); | 644 | void (*callback)(ide_drive_t *); |
645 | 645 | ||
646 | /* idetape only */ | 646 | /* idetape only */ |
647 | struct idetape_bh *bh; | 647 | struct idetape_bh *bh; |