Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...

[karo-tx-linux.git] / drivers / scsi / sun_esp.c

diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 8c766bcd10953bf6425d88d65549f8d377a07a7a..f9cf7015136648380aa6bc86f18809ed3eacd2c5 100644 (file)
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -5,7 +5,9 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 
 #include <asm/irq.h>
@@ -492,7 +494,7 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
                goto fail;
 
        host->max_id = (hme ? 16 : 8);
-       esp = host_to_esp(host);
+       esp = shost_priv(host);
 
        esp->host = host;
        esp->dev = esp_dev;