As warned by checkpatch.pl, <linux/io.h> should be used instead of <asm/io.h>. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
@@ -60,7 +60,7 @@
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
/* ALI1535 SMBus address offsets */
@@ -67,7 +67,7 @@
/* ALI15X3 SMBus address offsets */
#define SMBHSTSTS (0 + ali15x3_smba)
@@ -43,7 +43,7 @@
/* AMD756 SMBus address offsets */
#define SMB_ADDR_OFFSET 0xE0
@@ -18,7 +18,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");
@@ -23,8 +23,7 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
-
#include <mach/at91_twi.h>
#include <mach/board.h>
@@ -37,8 +37,8 @@
#include <linux/isa.h>
#include <linux/i2c-algo-pcf.h>
#include <asm/irq.h>
#include "../algos/i2c-algo-pcf.h"
@@ -28,7 +28,7 @@
#include <linux/i2c-algo-bit.h>
#include <asm/hydra.h>
@@ -39,7 +39,7 @@
#include <linux/interrupt.h>
#include <linux/i2c-id.h>
#include <linux/of_platform.h>
@@ -38,8 +38,7 @@
#include <linux/errno.h>
#include "i2c-iop3xx.h"
@@ -17,8 +17,7 @@
#include <linux/mv643xx_i2c.h>
/* Register defines */
#define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
@@ -57,7 +57,7 @@
#include <linux/dmi.h>
MODULE_AUTHOR ("Hans-Frieder Vogt <hfvogt@gmx.net>");
@@ -19,7 +19,7 @@
#include <linux/wait.h>
#include <linux/i2c-ocores.h>
struct ocores_i2c {
void __iomem *base;
@@ -33,7 +33,7 @@
#include <linux/i2c-smbus.h>
#include "i2c-parport.h"
#define DEFAULT_BASE 0x378
@@ -25,7 +25,7 @@
static struct pci_driver pasemi_smb_driver;
@@ -30,8 +30,8 @@
#include <linux/i2c-algo-pca.h>
#define DRIVER "i2c-pca-isa"
@@ -23,9 +23,9 @@
#include <linux/i2c-pca-platform.h>
#include <linux/gpio.h>
struct i2c_pca_pf_data {
void __iomem *reg_base;
/* PIIX4 SMBus address offsets */
#include <linux/completion.h>
#include <linux/mutex.h>
#define DRV_NAME "pmcmsptwi"
@@ -34,9 +34,9 @@
#include <linux/err.h>
#include <plat/i2c.h>
/*
@@ -35,9 +35,9 @@
#include <linux/cpufreq.h>
#include <plat/regs-iic.h>
#include <plat/iic.h>
@@ -36,8 +36,8 @@
#include "i2c-s6000.h"
#define DRV_NAME "i2c-s6000"
@@ -16,10 +16,10 @@
#include <linux/ioport.h>
#include <asm/clock.h>
#include <asm/i2c-sh7760.h>
/* register offsets */
#define I2CSCR 0x0 /* slave ctrl */
@@ -22,7 +22,7 @@
#include <linux/module.h>
#include <asm/sibyte/sb1250_regs.h>
#include <asm/sibyte/sb1250_smbus.h>
@@ -24,12 +24,11 @@
struct simtec_i2c_data {
struct resource *ioarea;
void __iomem *reg;
@@ -61,7 +61,7 @@
static int blacklist[] = {
PCI_DEVICE_ID_SI_540,
@@ -53,7 +53,7 @@
/* SIS630 SMBus registers */
#define SMB_STS 0x80 /* status */
@@ -38,7 +38,7 @@
/* base address register in PCI config space */
#define SIS96x_BAR 0x04
@@ -15,8 +15,7 @@
#define I2C_CONTROL 0x00
#define I2C_CONTROLS 0x00
/* Power management registers */
#define PM_CFG_REVID 0x08 /* silicon revision code */
@@ -51,7 +51,7 @@
static struct pci_dev *vt596_pdev;
@@ -32,7 +32,7 @@
#include <linux/scx200.h>
@@ -27,7 +27,7 @@
#include <linux/scx200_gpio.h>