diff --git a/[refs] b/[refs]
index 97dda1c6020e..8b0414656029 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de9f0cf93fcbccc2de4e6bcb5ef90f997616be3b
+refs/heads/master: d679f805e7d16291f7671710dd42522561a46611
diff --git a/trunk/drivers/scsi/esp_scsi.c b/trunk/drivers/scsi/esp_scsi.c
index 99ce03331b64..ec71061aef61 100644
--- a/trunk/drivers/scsi/esp_scsi.c
+++ b/trunk/drivers/scsi/esp_scsi.c
@@ -2212,7 +2212,7 @@ static void __devinit esp_init_swstate(struct esp *esp)
 }
 
 /* This places the ESP into a known state at boot time. */
-static void __devinit esp_bootup_reset(struct esp *esp)
+static void esp_bootup_reset(struct esp *esp)
 {
 	u8 val;