Merge branch 'linus' into core/softlockup

[linux-2.6] / drivers / scsi / aic94xx / aic94xx.h

diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
index eb8efdcefe482e0bf8997b566a72db30d76027ba..2ef459e9cda1a190213ae59fc2b64126f50c8923 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx.h
+++ b/drivers/scsi/aic94xx/aic94xx.h
@@ -58,7 +58,6 @@
 
 extern struct kmem_cache *asd_dma_token_cache;
 extern struct kmem_cache *asd_ascb_cache;
-extern char sas_addr_str[2*SAS_ADDR_SIZE + 1];
 
 static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr)
 {
@@ -68,21 +67,6 @@ static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr)
        *p = '\0';
 }
 
-static inline void asd_destringify_sas_addr(u8 *sas_addr, const char *p)
-{
-       int i;
-       for (i = 0; i < SAS_ADDR_SIZE; i++) {
-               u8 h, l;
-               if (!*p)
-                       break;
-               h = isdigit(*p) ? *p-'0' : *p-'A'+10;
-               p++;
-               l = isdigit(*p) ? *p-'0' : *p-'A'+10;
-               p++;
-               sas_addr[i] = (h<<4) | l;
-       }
-}
-
 struct asd_ha_struct;
 struct asd_ascb;