X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=it87.c;h=027ede9d63e81e879f05a7e416eab4814883070d;hb=67f8b470ec25ba24d6334061f4494330c847ac46;hp=eae64f38ee1fe8d5927e8fba85efd2a1f7017230;hpb=aeafb7be7c845d3a60691a32c6e1d86eca623691;p=groeck-it87

diff --git a/it87.c b/it87.c
index eae64f3..027ede9 100644
--- a/it87.c
+++ b/it87.c
@@ -86,6 +86,10 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
+static bool ignore_resource_conflict;
+module_param(ignore_resource_conflict, bool, 0);
+MODULE_PARM_DESC(ignore_resource_conflict, "Ignore ACPI resource conflict");
+
 static struct platform_device *it87_pdev[2];
 
 #define	REG_2E	0x2e	/* The register to read/write */
@@ -3801,8 +3805,10 @@ static int __init it87_device_add(int index, unsigned short address,
 	int err;
 
 	err = acpi_check_resource_conflict(&res);
-	if (err)
-		return err;
+	if (err) {
+		if (!ignore_resource_conflict)
+			return err;
+	}
 
 	pdev = platform_device_alloc(DRVNAME, address);
 	if (!pdev)