Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / ata / pata_acpi.c

diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index fa2bfc3..ade4c3e 100644 (file)
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -28,7 +28,7 @@ struct pata_acpi {
 
 /**
  *     pacpi_pre_reset -       check for 40/80 pin
- *     @ap: Port
+ *     @link: ATA link
  *     @deadline: deadline jiffies for the operation
  *
  *     Perform the PATA port setup we need.
@@ -63,8 +63,8 @@ static int pacpi_cable_detect(struct ata_port *ap)
 
 /**
  *     pacpi_discover_modes    -       filter non ACPI modes
+ *     @ap: ATA port
  *     @adev: ATA device
- *     @mask: proposed modes
  *
  *     Try the modes available and see which ones the ACPI method will
  *     set up sensibly. From this we get a mask of ACPI modes we can use
@@ -224,7 +224,7 @@ static struct ata_port_operations pacpi_ops = {
 /**
  *     pacpi_init_one - Register ACPI ATA PCI device with kernel services
  *     @pdev: PCI device to register
- *     @ent: Entry in pacpi_pci_tbl matching with @pdev
+ *     @id: PCI device ID
  *
  *     Called from kernel PCI layer.
  *