From 548cc98645993c4e3835f543b8ddf12142d5728d Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Fri, 30 Apr 2010 09:34:32 -0400
Subject: [PATCH] --- yaml --- r: 192571 b: refs/heads/master c:
 c2d45b4da042720ae94648b417d0e051742441d4 h: refs/heads/master i:   192569:
 9ffb4647c295e6cab89636a672381c7f9e39f425   192567:
 cae373a27a08e506ef46acbf69d73b7dc933b51d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7264f1657825..fa311263fea9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0dbd86b12be9af7cda230890eb741d5cb8b624
+refs/heads/master: c2d45b4da042720ae94648b417d0e051742441d4
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index eb5ff0531cfb..51ceaee98f9f 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
 
 			c->Request = ioc->Request;
 			if (ioc->buf_size > 0) {
-				int i;
 				for (i = 0; i < sg_used; i++) {
 					temp64.val =
 					    pci_map_single(host->pdev, buff[i],
@@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index,
 
 	/* if it was the last disk, find the new hightest lun */
 	if (clear_all && recalculate_highest_lun) {
-		int i, newhighest = -1;
+		int newhighest = -1;
 		for (i = 0; i <= h->highest_lun; i++) {
 			/* if the disk has size > 0, it is available */
 			if (h->drv[i] && h->drv[i]->heads)