diff options
Diffstat (limited to 'drivers/hwmon/w83627ehf.c')
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 075164dd65a7..a3a01dc35a31 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <linux/hwmon-vid.h> | 48 | #include <linux/hwmon-vid.h> |
49 | #include <linux/err.h> | 49 | #include <linux/err.h> |
50 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
51 | #include <linux/acpi.h> | ||
51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
52 | #include "lm75.h" | 53 | #include "lm75.h" |
53 | 54 | ||
@@ -1544,6 +1545,11 @@ static int __init sensors_w83627ehf_init(void) | |||
1544 | res.start = address + IOREGION_OFFSET; | 1545 | res.start = address + IOREGION_OFFSET; |
1545 | res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1; | 1546 | res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1; |
1546 | res.flags = IORESOURCE_IO; | 1547 | res.flags = IORESOURCE_IO; |
1548 | |||
1549 | err = acpi_check_resource_conflict(&res); | ||
1550 | if (err) | ||
1551 | goto exit; | ||
1552 | |||
1547 | err = platform_device_add_resources(pdev, &res, 1); | 1553 | err = platform_device_add_resources(pdev, &res, 1); |
1548 | if (err) { | 1554 | if (err) { |
1549 | printk(KERN_ERR DRVNAME ": Device resource addition failed " | 1555 | printk(KERN_ERR DRVNAME ": Device resource addition failed " |