From 030e6cb5b52f07d918d6789ef7c047e62c9ceccb Mon Sep 17 00:00:00 2001
From: Al Viro <viro@www.linux.org.uk>
Date: Tue, 26 Apr 2005 07:43:43 -0700
Subject: [PATCH] --- yaml --- r: 478 b: refs/heads/master c:
 766f2fa170e65948053b06c6106c8dc8526c3e14 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_sup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8d21a485cec..f4c4cb05e7f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9be80c0f0f61e8c0572d7c9d73b3ef839754a953
+refs/heads/master: 766f2fa170e65948053b06c6106c8dc8526c3e14
diff --git a/trunk/drivers/scsi/qla2xxx/qla_sup.c b/trunk/drivers/scsi/qla2xxx/qla_sup.c
index 0e75fbb77b6b..32583bbb487f 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_sup.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_sup.c
@@ -85,7 +85,7 @@ qla2x00_unlock_nvram_access(scsi_qla_host_t *ha)
 void
 qla2x00_release_nvram_protection(scsi_qla_host_t *ha)
 {
-	device_reg_t *reg;
+	device_reg_t __iomem *reg;
 	uint32_t word;
 
 	reg = ha->iobase;