diff options
author | Oliver Schinagl <oliver@schinagl.nl> | 2011-03-15 12:33:20 (GMT) |
---|---|---|
committer | Oliver Schinagl <oliver@schinagl.nl> | 2011-03-15 12:33:20 (GMT) |
commit | d66024a03c43952bc230fa9d0133f545d9caab00 (patch) | |
tree | f9994677e8f7ab051d014ce97c695a163cb6af45 /uClinux-2.4.20-uc1/drivers/scsi/hosts.c | |
parent | 6dcf0627548ed55ae7819bf1bab446ee87ffc8bc (diff) | |
download | openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.zip openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.tar.gz openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.tar.bz2 |
W90N745 scsi changes
Diffstat (limited to 'uClinux-2.4.20-uc1/drivers/scsi/hosts.c')
-rw-r--r-- | uClinux-2.4.20-uc1/drivers/scsi/hosts.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/uClinux-2.4.20-uc1/drivers/scsi/hosts.c b/uClinux-2.4.20-uc1/drivers/scsi/hosts.c index 72e87c6..dda47ae 100644 --- a/uClinux-2.4.20-uc1/drivers/scsi/hosts.c +++ b/uClinux-2.4.20-uc1/drivers/scsi/hosts.c @@ -136,9 +136,15 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){ int flag_new = 1; const char * hname; size_t hname_len; +#ifndef CONFIG_BOARD_W90N745 retval = (struct Scsi_Host *)kmalloc(sizeof(struct Scsi_Host) + j, (tpnt->unchecked_isa_dma && j ? GFP_DMA : 0) | GFP_ATOMIC); +#else + retval = (struct Scsi_Host *)kmalloc(sizeof(struct Scsi_Host) + j, + (tpnt->unchecked_isa_dma && j ? + 0 : 0)| GFP_ATOMIC); +#endif if(retval == NULL) { printk("scsi: out of memory in scsi_register.\n"); |