diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/scsi/aic94xx/aic94xx_sds.h | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_sds.h')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_sds.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.h b/drivers/scsi/aic94xx/aic94xx_sds.h index bb9795a04dc3..a06dc0114b8c 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.h +++ b/drivers/scsi/aic94xx/aic94xx_sds.h | |||
| @@ -110,9 +110,9 @@ struct bios_file_header { | |||
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, | 112 | int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, |
| 113 | void *src, u32 dest_offset, u32 bytes_to_verify); | 113 | const void *src, u32 dest_offset, u32 bytes_to_verify); |
| 114 | int asd_write_flash_seg(struct asd_ha_struct *asd_ha, | 114 | int asd_write_flash_seg(struct asd_ha_struct *asd_ha, |
| 115 | void *src, u32 dest_offset, u32 bytes_to_write); | 115 | const void *src, u32 dest_offset, u32 bytes_to_write); |
| 116 | int asd_chk_write_status(struct asd_ha_struct *asd_ha, | 116 | int asd_chk_write_status(struct asd_ha_struct *asd_ha, |
| 117 | u32 sector_addr, u8 erase_flag); | 117 | u32 sector_addr, u8 erase_flag); |
| 118 | int asd_check_flash_type(struct asd_ha_struct *asd_ha); | 118 | int asd_check_flash_type(struct asd_ha_struct *asd_ha); |