--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_hwi.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5504/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_hwi.h	2007-01-11 07:38:19.000000000 +0000
@@ -46,7 +46,6 @@
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR10 0x410
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR12 0x412
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR1E 0x41E
-#define PCI_DEVICE_ID_ADAPTEC2_RAZOR1F 0x41F
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR30 0x430
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR32 0x432
 #define PCI_DEVICE_ID_ADAPTEC2_RAZOR3E 0x43E
@@ -193,16 +192,6 @@
 	struct asd_ascb **escb_arr; /* array of pointers to escbs */
 };
 
-/* This is an internal port structure. These are used to get accurate
- * phy_mask for updating DDB 0.
- */
-struct asd_port {
-	u8  sas_addr[SAS_ADDR_SIZE];
-	u8  attached_sas_addr[SAS_ADDR_SIZE];
-	u32 phy_mask;
-	int num_phys;
-};
-
 /* This is the Host Adapter structure.  It describes the hardware
  * SAS adapter.
  */
@@ -221,8 +210,6 @@
 	struct hw_profile hw_prof;
 
 	struct asd_phy    phys[ASD_MAX_PHYS];
-	spinlock_t        asd_ports_lock;
-	struct asd_port   asd_ports[ASD_MAX_PHYS];
 	struct asd_sas_port   ports[ASD_MAX_PHYS];
 
 	struct dma_pool  *scb_pool;