diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2011-10-13 15:11:39 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2011-10-14 13:25:24 -0400 |
| commit | 0dcd0a76370a526d4bc844d82d54c717eb40e042 (patch) | |
| tree | 26a360038a11850c6cb260c77a147214a46beb43 /drivers/ata/pata_legacy.c | |
| parent | 4780c0b25e3f9d77122fb03ca000d3aa53992677 (diff) | |
| download | linux-0dcd0a76370a526d4bc844d82d54c717eb40e042.tar.bz2 | |
libata: remove no longer needed pata_qdi driver
QDI65x0 controllers are fully supported by pata_legacy driver
so remove no longer needed pata_qdi driver.
Leave PATA_QDI config option for compatibility reasons and teach
pata_legacy to preserve the old behavior of pata_qdi driver.
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_legacy.c')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index d960f8e9e8b1..e71fdfbf69b3 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -137,11 +137,17 @@ static int ht6560a; /* HT 6560A on primary 1, second 2, both 3 */ static int ht6560b; /* HT 6560A on primary 1, second 2, both 3 */ static int opti82c611a; /* Opti82c611A on primary 1, sec 2, both 3 */ static int opti82c46x; /* Opti 82c465MV present(pri/sec autodetect) */ -static int qdi; /* Set to probe QDI controllers */ static int autospeed; /* Chip present which snoops speed changes */ static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */ static int iordy_mask = 0xFFFFFFFF; /* Use iordy if available */ +/* Set to probe QDI controllers */ +#ifdef CONFIG_PATA_QDI_MODULE +static int qdi = 1; +#else +static int qdi; +#endif + #ifdef CONFIG_PATA_WINBOND_VLB_MODULE static int winbond = 1; /* Set to probe Winbond controllers, give I/O port if non standard */ @@ -1306,6 +1312,7 @@ MODULE_AUTHOR("Alan Cox"); MODULE_DESCRIPTION("low-level driver for legacy ATA"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); +MODULE_ALIAS("pata_qdi"); MODULE_ALIAS("pata_winbond"); module_param(probe_all, int, 0); |