[SCSI] qla4xxx: set device state as per Link UP and LINK DOWN

[mv-sheeva.git] / drivers / scsi / imm.c

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index f97d172844be8e084cca57e3750752be77529816..4734ab0b3ff6ab9297352d532bf5aeb530757fe8 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -15,6 +15,7 @@
 #include <linux/parport.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -163,7 +164,7 @@ static int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start,
 
 #if IMM_DEBUG > 0
 #define imm_fail(x,y) printk("imm: imm_fail(%i) from %s at line %d\n",\
-          y, __FUNCTION__, __LINE__); imm_fail_func(x,y);
+          y, __func__, __LINE__); imm_fail_func(x,y);
 static inline void
 imm_fail_func(imm_struct *dev, int error_code)
 #else