ALSA: sound/usb: add preliminary support for UAC2 interrupts

[safe/jmp/linux-2.6] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 746ef9f..97e6ab4 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -624,8 +624,8 @@ extern const struct ide_tp_ops default_tp_ops;
  */
 struct ide_port_ops {
        void    (*init_dev)(ide_drive_t *);
-       void    (*set_pio_mode)(ide_drive_t *, const u8);
-       void    (*set_dma_mode)(ide_drive_t *, const u8);
+       void    (*set_pio_mode)(struct hwif_s *, ide_drive_t *);
+       void    (*set_dma_mode)(struct hwif_s *, ide_drive_t *);
        int     (*reset_poll)(ide_drive_t *);
        void    (*pre_reset)(ide_drive_t *);
        void    (*resetproc)(ide_drive_t *);
@@ -1496,7 +1496,6 @@ int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
 #ifdef CONFIG_IDE_XFER_MODE
 int ide_scan_pio_blacklist(char *);
 const char *ide_xfer_verbose(u8);
-u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
 int ide_pio_need_iordy(ide_drive_t *, const u8);
 int ide_set_pio_mode(ide_drive_t *, u8);
 int ide_set_dma_mode(ide_drive_t *, u8);