diff --git a/[refs] b/[refs]
index ccbc2cd18744..5bfbed8f8f73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2551a13e61d3c3df6c2da6de5a3ece78e6d67111
+refs/heads/master: a7ed0448e28ce6154390bf690b8b5c37853732dc
diff --git a/trunk/drivers/scsi/aic94xx/aic94xx_init.c b/trunk/drivers/scsi/aic94xx/aic94xx_init.c
index de0667011e13..5d761eb67442 100644
--- a/trunk/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/trunk/drivers/scsi/aic94xx/aic94xx_init.c
@@ -136,7 +136,7 @@ static int __devinit asd_map_memio(struct asd_ha_struct *asd_ha)
 	return err;
 }
 
-static void __devexit asd_unmap_memio(struct asd_ha_struct *asd_ha)
+static void asd_unmap_memio(struct asd_ha_struct *asd_ha)
 {
 	struct asd_ha_addrspace *io_handle;
 
@@ -173,7 +173,7 @@ static int __devinit asd_map_ioport(struct asd_ha_struct *asd_ha)
 	return err;
 }
 
-static void __devexit asd_unmap_ioport(struct asd_ha_struct *asd_ha)
+static void asd_unmap_ioport(struct asd_ha_struct *asd_ha)
 {
 	pci_release_region(asd_ha->pcidev, PCI_IOBAR_OFFSET);
 }
@@ -210,7 +210,7 @@ static int __devinit asd_map_ha(struct asd_ha_struct *asd_ha)
 	return err;
 }
 
-static void __devexit asd_unmap_ha(struct asd_ha_struct *asd_ha)
+static void asd_unmap_ha(struct asd_ha_struct *asd_ha)
 {
 	if (asd_ha->iospace)
 		asd_unmap_ioport(asd_ha);