From: root <root@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Teach the qdi driver to be more polite about probing when compiled in so that people who make allyesconfig don't get burned. Alan Signed-off-by: Alan Cox <alan@xxxxxxxxxx> --- drivers/scsi/pata_qdi.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) ff61ee478044f481f73c07a392aab7dfdcfee215 diff --git a/drivers/scsi/pata_qdi.c b/drivers/scsi/pata_qdi.c index ca6fef0..f8fc0ef 100644 --- a/drivers/scsi/pata_qdi.c +++ b/drivers/scsi/pata_qdi.c @@ -26,7 +26,7 @@ #include <linux/platform_device.h> #define DRV_NAME "pata_qdi" -#define DRV_VERSION "0.2.3" +#define DRV_VERSION "0.2.4" #define NR_HOST 4 /* Two 6580s */ @@ -41,7 +41,13 @@ struct qdi_data { static struct ata_host_set *qdi_host[NR_HOST]; static struct qdi_data qdi_data[NR_HOST]; -static int nr_qdi_host = 0; +static int nr_qdi_host; + +#ifdef MODULE +static int probe_qdi = 1; +#else +static int probe_qdi; +#endif static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev) { @@ -302,6 +308,9 @@ static __init int qdi_init(void) int ct = 0; int i; + if (probe_qdi == 0) + return; + /* * Check each possible QD65xx base address */ @@ -390,3 +399,5 @@ MODULE_VERSION(DRV_VERSION); module_init(qdi_init); module_exit(qdi_exit); +module_param(probe_qdi, int, 0); + -- 1.2.GIT - : send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html