From 0566639ed1fc466168cd6dc1797ccca93fb705f8 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 8 Mar 2006 00:14:27 -0800
Subject: [PATCH] --- yaml --- r: 22604 b: refs/heads/master c:
 fd1e29ed62cc307281d1a62f73ebac059ac6b6a1 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/FlashPoint.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a51a635a1fbc..3c238c784b78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d63a4cccf387a8e6210cfd818c1ea717beefc531
+refs/heads/master: fd1e29ed62cc307281d1a62f73ebac059ac6b6a1
diff --git a/trunk/drivers/scsi/FlashPoint.c b/trunk/drivers/scsi/FlashPoint.c
index d877a6a12aca..6089af003130 100644
--- a/trunk/drivers/scsi/FlashPoint.c
+++ b/trunk/drivers/scsi/FlashPoint.c
@@ -42,7 +42,6 @@
 
 
 
-typedef unsigned short          * ushort_ptr;
 
 
 #define s08bits	char
@@ -6003,7 +6002,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port)
    unsigned char i,k,scam_id;
 	unsigned char crcBytes[3];
 	PNVRamInfo pCurrNvRam;
-	ushort_ptr pCrcBytes;
+	unsigned short * pCrcBytes;
 
 	pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
 
@@ -6023,7 +6022,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port)
       if (!(FPT_sciso(p_port,&temp_id_string[0])))
          {
 			if(pCurrNvRam){
-				pCrcBytes = (ushort_ptr)&crcBytes[0];
+				pCrcBytes = (unsigned short *)&crcBytes[0];
 				*pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]);
 				crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]);
 				temp_id_string[1] = crcBytes[2];