--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/pcmcia/nsp_cs.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/scsi/pcmcia/nsp_cs.h	2007-01-11 07:38:19.000000000 +0000
@@ -266,7 +266,7 @@
 
 	int           TimerCount;
 	int           SelectionTimeOut;
-	struct scsi_cmnd *CurrentSC;
+	Scsi_Cmnd    *CurrentSC;
 	//int           CurrnetTarget;
 
 	int           FifoCount;
@@ -319,34 +319,30 @@
 					 int     hostno,
 #endif
 					 int     inout);
-static int nsp_queuecommand(struct scsi_cmnd *SCpnt,
-			    void (* done)(struct scsi_cmnd *SCpnt));
+static        int        nsp_queuecommand(Scsi_Cmnd *SCpnt, void (* done)(Scsi_Cmnd *SCpnt));
 
 /* Error handler */
-/*static int nsp_eh_abort       (struct scsi_cmnd *SCpnt);*/
-/*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/
-static int nsp_eh_bus_reset    (struct scsi_cmnd *SCpnt);
-static int nsp_eh_host_reset   (struct scsi_cmnd *SCpnt);
+/*static int nsp_eh_abort       (Scsi_Cmnd *SCpnt);*/
+/*static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt);*/
+static int nsp_eh_bus_reset    (Scsi_Cmnd *SCpnt);
+static int nsp_eh_host_reset   (Scsi_Cmnd *SCpnt);
 static int nsp_bus_reset       (nsp_hw_data *data);
 
 /* */
 static int  nsphw_init           (nsp_hw_data *data);
-static int  nsphw_start_selection(struct scsi_cmnd *SCpnt);
-static void nsp_start_timer      (struct scsi_cmnd *SCpnt, int time);
-static int  nsp_fifo_count       (struct scsi_cmnd *SCpnt);
-static void nsp_pio_read         (struct scsi_cmnd *SCpnt);
-static void nsp_pio_write        (struct scsi_cmnd *SCpnt);
-static int  nsp_nexus            (struct scsi_cmnd *SCpnt);
-static void nsp_scsi_done        (struct scsi_cmnd *SCpnt);
-static int  nsp_analyze_sdtr     (struct scsi_cmnd *SCpnt);
-static int  nsp_negate_signal    (struct scsi_cmnd *SCpnt,
-				  unsigned char mask, char *str);
-static int  nsp_expect_signal    (struct scsi_cmnd *SCpnt,
-				  unsigned char current_phase,
-				  unsigned char  mask);
-static int  nsp_xfer             (struct scsi_cmnd *SCpnt, int phase);
-static int  nsp_dataphase_bypass (struct scsi_cmnd *SCpnt);
-static int  nsp_reselected       (struct scsi_cmnd *SCpnt);
+static int  nsphw_start_selection(Scsi_Cmnd *SCpnt);
+static void nsp_start_timer      (Scsi_Cmnd *SCpnt, int time);
+static int  nsp_fifo_count       (Scsi_Cmnd *SCpnt);
+static void nsp_pio_read         (Scsi_Cmnd *SCpnt);
+static void nsp_pio_write        (Scsi_Cmnd *SCpnt);
+static int  nsp_nexus            (Scsi_Cmnd *SCpnt);
+static void nsp_scsi_done        (Scsi_Cmnd *SCpnt);
+static int  nsp_analyze_sdtr     (Scsi_Cmnd *SCpnt);
+static int  nsp_negate_signal    (Scsi_Cmnd *SCpnt, unsigned char mask, char *str);
+static int  nsp_expect_signal    (Scsi_Cmnd *SCpnt, unsigned char current_phase, unsigned char  mask);
+static int  nsp_xfer             (Scsi_Cmnd *SCpnt, int phase);
+static int  nsp_dataphase_bypass (Scsi_Cmnd *SCpnt);
+static int  nsp_reselected       (Scsi_Cmnd *SCpnt);
 static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht);
 
 /* Interrupt handler */
@@ -359,8 +355,8 @@
 
 /* Debug */
 #ifdef NSP_DEBUG
-static void show_command (struct scsi_cmnd *SCpnt);
-static void show_phase   (struct scsi_cmnd *SCpnt);
+static void show_command (Scsi_Cmnd *SCpnt);
+static void show_phase   (Scsi_Cmnd *SCpnt);
 static void show_busphase(unsigned char stat);
 static void show_message (nsp_hw_data *data);
 #else