diff --git a/[refs] b/[refs] index 61315647c48f..d206f44a15f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d4423caaa1b9ca709ef6a911a030a3b6e68c46b +refs/heads/master: e0b4eb5193fed5c63413b0c137be29b0477d15ca diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c index 57d9a9a79a6f..0daf923541ff 100644 --- a/trunk/drivers/ide/ide-iops.c +++ b/trunk/drivers/ide/ide-iops.c @@ -95,7 +95,7 @@ void SELECT_DRIVE (ide_drive_t *drive) hwif->OUTB(drive->select.all, hwif->io_ports.device_addr); } -void SELECT_MASK (ide_drive_t *drive, int mask) +static void SELECT_MASK(ide_drive_t *drive, int mask) { const struct ide_port_ops *port_ops = drive->hwif->port_ops; diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index b0135b0c3a04..19ec852dffd2 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -965,7 +965,6 @@ typedef struct ide_task_s { void ide_tf_dump(const char *, struct ide_taskfile *); extern void SELECT_DRIVE(ide_drive_t *); -extern void SELECT_MASK(ide_drive_t *, int); extern int drive_is_ready(ide_drive_t *);