diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:03:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:03:03 -0700 |
| commit | fb2c922b8588115d8914492493a37109bfb07884 (patch) | |
| tree | 9b532d2989d998b1997bf04eae0f3eb15f1843b5 /drivers/ata/pata_platform.c | |
| parent | 9ce3075c20d458040138690edfdf6446664ec3ee (diff) | |
| parent | b9a3b4d1453689f2927668fcdc4827fdccf44d1b (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_platform: don't use generic ata_port_start
Use menuconfig objects: libata
add the ATI SB700 SATA controller device id to AHCI pci table
Add the combined mode for ATI SB700
pata_pcmcia: recognize 2GB CompactFlash from Transcend
git-libata-all: sata_via build fix
libata-acpi: clean up parameters and misc stuff
libata-acpi: s/CONFIG_SATA_ACPI/CONFIG_ATA_ACPI/
libata: give devices one last chance even if recovery failed with -EINVAL
libata: fallback to the other IDENTIFY on device error, take#2
libata: ignore EH scheduling during initialization
libata: clean up SFF init mess
libata: implement libata.spindown_compat
libata: reimplement suspend/resume support using sdev->manage_start_stop
Diffstat (limited to 'drivers/ata/pata_platform.c')
| -rw-r--r-- | drivers/ata/pata_platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c index a0a650c7f27..1f6384895a4 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c @@ -48,6 +48,8 @@ static int pata_platform_set_mode(struct ata_port *ap, struct ata_device **unuse return 0; } +static int ata_dummy_ret0(struct ata_port *ap) { return 0; } + static struct scsi_host_template pata_platform_sht = { .module = THIS_MODULE, .name = DRV_NAME, @@ -91,7 +93,7 @@ static struct ata_port_operations pata_platform_port_ops = { .irq_on = ata_irq_on, .irq_ack = ata_irq_ack, - .port_start = ata_port_start, + .port_start = ata_dummy_ret0, }; static void pata_platform_setup_port(struct ata_ioports *ioaddr, |