Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[linux-2.6] / drivers / scsi / esp_scsi.c

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 99ce03331b649f41852269149d9b8df5619c2312..ec71061aef61165da0ef3c77ff58e66a260a34c8 100644 (file)
--- a/drivers/scsi/esp_scsi.c
+++ b/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;