From efca10ed586f1f8c0c183af159950486762e06f2 Mon Sep 17 00:00:00 2001
From: David Kilroy <kilroyd@googlemail.com>
Date: Thu, 2 Jul 2009 20:26:45 +0100
Subject: [PATCH] --- yaml --- r: 158894 b: refs/heads/master c:
 4244f41a040288e07d050ea64f60997c584cce9e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/orinoco/scan.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0cdee4a2d1fb..63751dc69dd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a9b5e17952ec7ce938645a23ba29bcfdb66c8d9
+refs/heads/master: 4244f41a040288e07d050ea64f60997c584cce9e
diff --git a/trunk/drivers/net/wireless/orinoco/scan.c b/trunk/drivers/net/wireless/orinoco/scan.c
index 522eb98ec6f2..d2f10e9c2162 100644
--- a/trunk/drivers/net/wireless/orinoco/scan.c
+++ b/trunk/drivers/net/wireless/orinoco/scan.c
@@ -190,7 +190,7 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
 			/* Sanity check for atom_len */
 			if (atom_len < sizeof(struct prism2_scan_apinfo)) {
 				printk(KERN_ERR "%s: Invalid atom_len in scan "
-				       "data: %d\n", priv->ndev->name,
+				       "data: %zu\n", priv->ndev->name,
 				       atom_len);
 				abort = true;
 				goto scan_abort;
@@ -206,8 +206,8 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
 
 	/* Check that we got an whole number of atoms */
 	if ((len - offset) % atom_len) {
-		printk(KERN_ERR "%s: Unexpected scan data length %d, "
-		       "atom_len %d, offset %d\n", priv->ndev->name, len,
+		printk(KERN_ERR "%s: Unexpected scan data length %zu, "
+		       "atom_len %zu, offset %d\n", priv->ndev->name, len,
 		       atom_len, offset);
 		abort = true;
 		goto scan_abort;