diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 13:47:57 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 13:47:57 +0100 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /drivers/hwmon/via686a.c | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
| download | talos-op-linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.tar.gz talos-op-linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.zip | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'drivers/hwmon/via686a.c')
| -rw-r--r-- | drivers/hwmon/via686a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index a022aedcaacb..39e82a492f26 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c @@ -42,7 +42,7 @@ #include <linux/mutex.h> #include <linux/sysfs.h> #include <linux/acpi.h> -#include <asm/io.h> +#include <linux/io.h> /* If force_addr is set to anything different from 0, we forcibly enable |
