diff options
Diffstat (limited to 'libre/linux-libre/watchdog-3.5.x.patch')
-rw-r--r-- | libre/linux-libre/watchdog-3.5.x.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/libre/linux-libre/watchdog-3.5.x.patch b/libre/linux-libre/watchdog-3.5.x.patch deleted file mode 100644 index 7ac1e6732..000000000 --- a/libre/linux-libre/watchdog-3.5.x.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c -index 027cc8f..a05fdfc 100644 ---- a/drivers/mfd/lpc_ich.c -+++ b/drivers/mfd/lpc_ich.c -@@ -765,7 +765,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - u32 base_addr_cfg; - u32 base_addr; - int ret; -- bool acpi_conflict = false; - struct resource *res; - - /* Setup power management base register */ -@@ -780,20 +779,11 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - res = wdt_io_res(ICH_RES_IO_TCO); - res->start = base_addr + ACPIBASE_TCO_OFF; - res->end = base_addr + ACPIBASE_TCO_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } - - res = wdt_io_res(ICH_RES_IO_SMI); - res->start = base_addr + ACPIBASE_SMI_OFF; - res->end = base_addr + ACPIBASE_SMI_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } -+ - lpc_ich_enable_acpi_space(dev); - - /* -@@ -813,11 +803,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - res = wdt_mem_res(ICH_RES_MEM_GCS); - res->start = base_addr + ACPIBASE_GCS_OFF; - res->end = base_addr + ACPIBASE_GCS_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } - } - - lpc_ich_finalize_cell(&lpc_ich_cells[LPC_WDT], id); -@@ -825,9 +810,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - 1, NULL, 0); - - wdt_done: -- if (acpi_conflict) -- pr_warn("Resource conflict(s) found affecting %s\n", -- lpc_ich_cells[LPC_WDT].name); - return ret; - } - --- -1.7.1 - -
\ No newline at end of file |