---

yaml
---
r: 98135
b: refs/heads/master
c: 0cbccbc
h: refs/heads/master
i:
  98133: ad8de5e
  98131: d7b8783
  98127: a75bb6a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbc69fd9b76158daaa83e5372e44fdd81df20f92
+refs/heads/master: 0cbccbc30a60ff60dbeb203154f1f527c632de9b

trunk/drivers/ide/ide-generic.c

@@ -22,6 +22,10 @@
 
 #define DRV_NAME	"ide_generic"
 
+static int probe_mask = 0x03;
+module_param(probe_mask, int, 0);
+MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports");
+
 static ssize_t store_add(struct class *cls, const char *buf, size_t n)
 {
 	ide_hwif_t *hwif;
@@ -89,14 +93,17 @@ static int __init ide_generic_init(void)
 	u8 idx[MAX_HWIFS];
 	int i;
 
+	printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
+			 "parameter for probing all legacy ISA IDE ports\n");
+
 	for (i = 0; i < MAX_HWIFS; i++) {
 		ide_hwif_t *hwif;
 		unsigned long io_addr = ide_default_io_base(i);
 		hw_regs_t hw;
 
 		idx[i] = 0xff;
 
-		if (io_addr) {
+		if ((probe_mask & (1 << i)) && io_addr) {
 			if (!request_region(io_addr, 8, DRV_NAME)) {
 				printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "
 						"not free.\n",