diff options
| author | Linus Torvalds | 2010-05-21 19:49:43 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-05-21 19:49:43 +0200 |
| commit | e0bc5d4a54938eedcde14005210e6c08aa9727e4 (patch) | |
| tree | bcbabc1651c6bc9c138363b617714cd2349cecb3 /drivers/i2c/busses/i2c-ali15x3.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
| parent | i2c-nforce2: Remove redundant error messages on ACPI conflict (diff) | |
| download | kernel-qcow2-linux-e0bc5d4a54938eedcde14005210e6c08aa9727e4.tar.gz kernel-qcow2-linux-e0bc5d4a54938eedcde14005210e6c08aa9727e4.tar.xz kernel-qcow2-linux-e0bc5d4a54938eedcde14005210e6c08aa9727e4.zip | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-nforce2: Remove redundant error messages on ACPI conflict
i2c: Use <linux/io.h> instead of <asm/io.h>
i2c-algo-pca: Fix coding style issues
i2c-dev: Fix all coding style issues
i2c-core: Fix some coding style issues
i2c-gpio: Move initialization code to subsys_initcall()
i2c-parport: Make template structure const
i2c-dev: Remove unnecessary casts
at24: Fall back to byte or word reads if needed
i2c-stub: Expose the default functionality flags
i2c/scx200_acb: Make PCI device ids constant
i2c-i801: Fix all checkpatch warnings
i2c-i801: All newer devices have all the optional features
i2c-i801: Let the user disable selected driver features
Diffstat (limited to 'drivers/i2c/busses/i2c-ali15x3.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 659f63f5e4af..b14f6d68221d 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c @@ -67,7 +67,7 @@ #include <linux/i2c.h> #include <linux/init.h> #include <linux/acpi.h> -#include <asm/io.h> +#include <linux/io.h> /* ALI15X3 SMBus address offsets */ #define SMBHSTSTS (0 + ali15x3_smba) |