diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/scsi/sata_sil.c | |
| parent | [ARM] Move AMBA include files to include/linux/amba/ (diff) | |
| parent | [PATCH] Fix posix-cpu-timers sched_time accumulation (diff) | |
| download | linux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz linux-123656d4cc8c946f578ebd18c2050f5251720428.zip | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/scsi/sata_sil.c')
| -rw-r--r-- | drivers/scsi/sata_sil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index 36091868560d..b017f85e6d6a 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c @@ -147,7 +147,6 @@ static struct scsi_host_template sil_sht = { .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, - .ordered_flush = 1, }; static const struct ata_port_operations sil_ops = { @@ -176,7 +175,7 @@ static const struct ata_port_operations sil_ops = { .host_stop = ata_pci_host_stop, }; -static struct ata_port_info sil_port_info[] = { +static const struct ata_port_info sil_port_info[] = { /* sil_3112 */ { .sht = &sil_sht, |