diff --git a/[refs] b/[refs]
index 21f1387cbbdd..e8baad26daa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b173cc9d73c00a3182ec3fdb0f03909cad4b5b
+refs/heads/master: abab7ebf8cc12a6bb03d06b103a49e97276168f0
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
index 0e21b0982480..87e86e93ebf9 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -442,7 +442,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 			if ((bootloc < 2) || (bootloc > 5)) {
 				printk(KERN_WARNING "%s: CFI contains unrecognised boot "
 				       "bank location (%d). Assuming bottom.\n",
-				       bootloc, map->name);
+				       map->name, bootloc);
 				bootloc = 2;
 			}