From a87da20afc1d7e3cb41930957dd4dbc91f6c2fac Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 10 May 2010 21:41:29 +0200 Subject: [PATCH] --- yaml --- r: 192617 b: refs/heads/master c: c7a8209f766961eea4cfc6f22d2d6e06ef63546c h: refs/heads/master i: 192615: 2b8a1429cac0b65bd8a7bc07f2baadce07ca587e v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-sff.c | 2 +- trunk/drivers/ata/libata.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b7bc02715501..74305a840f29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a7adff09ac3dd3d1facaf92b4a8cc1b92d370b6 +refs/heads/master: c7a8209f766961eea4cfc6f22d2d6e06ef63546c diff --git a/trunk/drivers/ata/libata-sff.c b/trunk/drivers/ata/libata-sff.c index a4700af43d10..d5dd88d6dea0 100644 --- a/trunk/drivers/ata/libata-sff.c +++ b/trunk/drivers/ata/libata-sff.c @@ -511,7 +511,7 @@ EXPORT_SYMBOL_GPL(ata_sff_dev_select); * LOCKING: * caller. */ -void ata_dev_select(struct ata_port *ap, unsigned int device, +static void ata_dev_select(struct ata_port *ap, unsigned int device, unsigned int wait, unsigned int can_sleep) { if (ata_msg_probe(ap)) diff --git a/trunk/drivers/ata/libata.h b/trunk/drivers/ata/libata.h index 823e63096362..132da80aa23a 100644 --- a/trunk/drivers/ata/libata.h +++ b/trunk/drivers/ata/libata.h @@ -202,9 +202,6 @@ static inline int sata_pmp_attach(struct ata_device *dev) /* libata-sff.c */ #ifdef CONFIG_ATA_SFF -extern void ata_dev_select(struct ata_port *ap, unsigned int device, - unsigned int wait, unsigned int can_sleep); -extern u8 ata_irq_on(struct ata_port *ap); extern void ata_pio_task(struct work_struct *work); #endif /* CONFIG_ATA_SFF */