From: Alan Cox <alan@lxorguk.ukuu.org.uk>

Nothing terribly exciting here just odd glitches from the merge

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/pata_hpt366.c |    1 -
 1 file changed, 1 deletion(-)

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.
_