From de56e6c749228f03ae1d1b2b98b643543f3dd930 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 14 May 2008 23:06:15 +0200 Subject: [PATCH] --- yaml --- r: 96719 b: refs/heads/master c: e0b4eb5193fed5c63413b0c137be29b0477d15ca h: refs/heads/master i: 96717: a00709c90e6d0fe83c57ad9174f4119d35176be9 96715: 41736b1e69b1ecf047da88557fb27a3cd3a764d1 96711: 46af667b4f51914f214c2c08a797f72f636b53af 96703: 106dd3c9289aaf68e5f5198f0408b0636041a032 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-iops.c | 2 +- trunk/include/linux/ide.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) 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 *);