hwmon: Include <linux/io.h> instead of <asm/io.h>

[mv-sheeva.git] / drivers / hwmon / sis5595.c

diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index a276806f3d53cd8b9ab192f3283019b7550531c5..12f2e708656059e3dc357c438ee5d0c405f2fd0f 100644 (file)
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -62,7 +62,8 @@
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
-#include <asm/io.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
 
 
 /* If force_addr is set to anything different from 0, we forcibly enable
@@ -727,6 +728,10 @@ static int __devinit sis5595_device_add(unsigned short address)
        };
        int err;
 
+       err = acpi_check_resource_conflict(&res);
+       if (err)
+               goto exit;
+
        pdev = platform_device_alloc("sis5595", address);
        if (!pdev) {
                err = -ENOMEM;