Merge with /home/shaggy/git/linus-clean/

1 files changed, 0 insertions, 16 deletions

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 54c52349adc5..3be546439252 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -665,15 +665,6 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         return ata_pci_init_one(pdev, port_info, n_ports);
 }
 
-/**
- *      piix_init -
- *
- *      LOCKING:
- *
- *      RETURNS:
- *
- */
-
 static int __init piix_init(void)
 {
         int rc;
@@ -689,13 +680,6 @@ static int __init piix_init(void)
         return 0;
 }
 
-/**
- *      piix_exit -
- *
- *      LOCKING:
- *
- */
-
 static void __exit piix_exit(void)
 {
         pci_unregister_driver(&piix_pci_driver);