From: James Bottomley <jejb@titanic.(none)>
Date: Sat, 5 Nov 2005 04:29:52 +0000 (-0600)
Subject: Merge by Hand
X-Git-Tag: v2.6.15-rc1~723^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849a8924a6740ecbf9711e015beca69425f0c429;p=linux-2.6

Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

849a8924a6740ecbf9711e015beca69425f0c429
diff --cc drivers/scsi/dec_esp.c
index 4f39890b44,2d7bde693d..256d6baf8d
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@@ -228,10 -230,11 +230,11 @@@ static int dec_esp_detect(Scsi_Host_Tem
  			mem_start = get_tc_base_addr(slot);
  
  			/* Store base addr into esp struct */
 -			esp->slot = mem_start;
 +			esp->slot = CPHYSADDR(mem_start);
  
  			esp->dregs = 0;
- 			esp->eregs = (struct ESP_regs *) (mem_start + DEC_SCSI_SREG);
+ 			esp->eregs = (void *)CKSEG1ADDR(mem_start +
+ 							DEC_SCSI_SREG);
  			esp->do_pio_cmds = 1;
  
  			/* Set the command buffer */
diff --cc drivers/scsi/scsi_transport_iscsi.c
index d2caa35059,d010aeda9d..49fd18c1a9
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@@ -19,9 -21,8 +21,11 @@@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  #include <linux/module.h>
 +#include <linux/string.h>
 +#include <linux/slab.h>
+ #include <linux/mempool.h>
+ #include <net/tcp.h>
 +
  #include <scsi/scsi.h>
  #include <scsi/scsi_host.h>
  #include <scsi/scsi_device.h>
diff --cc include/scsi/scsi_transport_fc.h
index c04405bead,319ff7a60d..fac547d32a
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@@ -28,7 -28,7 +28,8 @@@
  #define SCSI_TRANSPORT_FC_H
  
  #include <linux/config.h>
 +#include <linux/sched.h>
+ #include <scsi/scsi.h>
  
  struct scsi_transport_template;