Skip to content

Commit

Permalink
hwmon: Include <linux/io.h> instead of <asm/io.h>
Browse files Browse the repository at this point in the history
Drivers should be including <linux/io.h> instead of <asm/io.h>.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alistair John Strachan <alistair@devzero.co.uk>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Frank Seidel <frank@f-seidel.de>
Acked-by: Jim Cromie <jim.cromie@gmail.com>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
H Hartley Sweeten authored and Jean Delvare committed Sep 15, 2009
1 parent 1915fb7 commit 6055fae
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/abituguru.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/dmi.h>
#include <asm/io.h>
#include <linux/io.h>

/* Banks */
#define ABIT_UGURU_ALARM_BANK 0x20 /* 1x 3 bytes */
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/abituguru3.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/dmi.h>
#include <asm/io.h>
#include <linux/io.h>

/* uGuru3 bank addresses */
#define ABIT_UGURU3_SETTINGS_BANK 0x01
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/applesmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <linux/dmi.h>
#include <linux/mutex.h>
#include <linux/hwmon-sysfs.h>
#include <asm/io.h>
#include <linux/io.h>
#include <linux/leds.h>
#include <linux/hwmon.h>
#include <linux/workqueue.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/dme1737.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

/* ISA device, if found */
static struct platform_device *pdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/f71805f.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <linux/sysfs.h>
#include <linux/ioport.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static unsigned short force_id;
module_param(force_id, ushort, 0);
Expand Down
3 changes: 1 addition & 2 deletions drivers/hwmon/hdaps.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
#include <linux/timer.h>
#include <linux/dmi.h>
#include <linux/jiffies.h>

#include <asm/io.h>
#include <linux/io.h>

#define HDAPS_LOW_PORT 0x1600 /* first port used by hdaps */
#define HDAPS_NR_PORTS 0x30 /* number of ports: 0x1600 - 0x162f */
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/it87.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include <linux/string.h>
#include <linux/dmi.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

#define DRVNAME "it87"

Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/lm78.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <linux/hwmon-sysfs.h>
#include <linux/err.h>
#include <linux/mutex.h>
#include <asm/io.h>
#include <linux/io.h>

/* ISA device, if found */
static struct platform_device *pdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/pc87360.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static u8 devid;
static struct platform_device *pdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/pc87427.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <linux/sysfs.h>
#include <linux/ioport.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static unsigned short force_id;
module_param(force_id, ushort, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/sis5595.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/smsc47b397.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static unsigned short force_id;
module_param(force_id, ushort, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/smsc47m1.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <linux/mutex.h>
#include <linux/sysfs.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static unsigned short force_id;
module_param(force_id, ushort, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/via686a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/vt1211.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <linux/mutex.h>
#include <linux/ioport.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static int uch_config = -1;
module_param(uch_config, int, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/vt8231.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>

static int force_addr;
module_param(force_addr, int, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/w83627ehf.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>
#include "lm75.h"

enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg };
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/w83627hf.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include <linux/mutex.h>
#include <linux/ioport.h>
#include <linux/acpi.h>
#include <asm/io.h>
#include <linux/io.h>
#include "lm75.h"

static struct platform_device *pdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/w83781d.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#ifdef CONFIG_ISA
#include <linux/platform_device.h>
#include <linux/ioport.h>
#include <asm/io.h>
#include <linux/io.h>
#endif

#include "lm75.h"
Expand Down

0 comments on commit 6055fae

Please sign in to comment.