Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next

[karo-tx-linux.git] / drivers / ata / pata_rdc.c

diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
index e71f998dd90ddfe4c9101996a5e59011e0a8a1bc..6a8665574fee5ad0e20e2f2423c76e32d8fca6a9 100644 (file)
--- a/drivers/ata/pata_rdc.c
+++ b/drivers/ata/pata_rdc.c
@@ -321,8 +321,7 @@ static struct scsi_host_template rdc_sht = {
  *     Zero on success, or -ERRNO value.
  */
 
-static int __devinit rdc_init_one(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
+static int rdc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        struct device *dev = &pdev->dev;
        struct ata_port_info port_info[2];