summaryrefslogtreecommitdiff
path: root/drivers/scsi/arm/fas216.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 13:41:51 +0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 13:41:51 +0400
commit3c3dd225819112e56554162c6b37e61a31924e0c (patch)
tree5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /drivers/scsi/arm/fas216.c
parenta915d4ca24b814daee9cddbc42cd41f59fe4fa8f (diff)
parent3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff)
downloadlinux-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
Diffstat (limited to 'drivers/scsi/arm/fas216.c')
-rw-r--r--drivers/scsi/arm/fas216.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 6206a666a8ec..737554c37d9e 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *
SCp->buffers_residual, suffix);
}
+#ifdef CHECK_STRUCTURE
static void fas216_dumpinfo(FAS216_Info *info)
{
static int used = 0;
@@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info)
info->internal_done, info->magic_end);
}
-#ifdef CHECK_STRUCTURE
static void __fas216_checkmagic(FAS216_Info *info, const char *func)
{
int corruption = 0;