From: Alan Cox Nothing terribly exciting here just odd glitches from the merge Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- drivers/ata/pata_hpt366.c | 1 - drivers/ata/pata_serverworks.c | 1 - drivers/ata/pata_sis.c | 2 -- 3 files changed, 4 deletions(-) diff -puN drivers/ata/pata_hpt366.c~libata-misc-minor-merge-fixups drivers/ata/pata_hpt366.c --- a/drivers/ata/pata_hpt366.c~libata-misc-minor-merge-fixups +++ a/drivers/ata/pata_hpt366.c @@ -169,7 +169,6 @@ static int hpt_dma_blacklisted(const str /** * hpt366_filter - mode selection filter - * @ap: ATA interface * @adev: ATA device * * Block UDMA on devices that cause trouble with this controller. diff -puN drivers/ata/pata_serverworks.c~libata-misc-minor-merge-fixups drivers/ata/pata_serverworks.c --- a/drivers/ata/pata_serverworks.c~libata-misc-minor-merge-fixups +++ a/drivers/ata/pata_serverworks.c @@ -139,7 +139,6 @@ static struct sv_cable_table cable_detec /** * serverworks_cable_detect - cable detection * @ap: ATA port - * @deadline: deadline jiffies for the operation * * Perform cable detection according to the device and subvendor * identifications diff -puN drivers/ata/pata_sis.c~libata-misc-minor-merge-fixups drivers/ata/pata_sis.c --- a/drivers/ata/pata_sis.c~libata-misc-minor-merge-fixups +++ a/drivers/ata/pata_sis.c @@ -88,7 +88,6 @@ static int sis_port_base(struct ata_devi /** * sis_133_cable_detect - check for 40/80 pin * @ap: Port - * @deadline: deadline jiffies for the operation * * Perform cable detection for the later UDMA133 capable * SiS chipset. @@ -109,7 +108,6 @@ static int sis_133_cable_detect(struct a /** * sis_66_cable_detect - check for 40/80 pin * @ap: Port - * @deadline: deadline jiffies for the operation * * Perform cable detection on the UDMA66, UDMA100 and early UDMA133 * SiS IDE controllers. _