diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 10:13:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 10:13:27 -0400 |
commit | 2727f226a65e034f93846def7fab314dee430df3 (patch) | |
tree | 68af1b225c3501358ec2666bf401f165a9eee739 | |
parent | 058ddee5625ade9e9e011b9ae155ac3b8d4eda3a (diff) |
[ARM] fix pnx4008 build errors
include/linux/i2c-pnx.h was missed when moving the include files.
Fix it now; it doesn't really need to include mach/i2c.h at all.
Successfully build tested with pnx4008_defconfig, which had
failed in linux-next.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/i2c.h | 3 | ||||
-rw-r--r-- | include/linux/i2c-pnx.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-pnx4008/include/mach/i2c.h b/arch/arm/mach-pnx4008/include/mach/i2c.h index 92e8d65006f7..259ac53abf40 100644 --- a/arch/arm/mach-pnx4008/include/mach/i2c.h +++ b/arch/arm/mach-pnx4008/include/mach/i2c.h | |||
@@ -12,9 +12,6 @@ | |||
12 | #ifndef __ASM_ARCH_I2C_H__ | 12 | #ifndef __ASM_ARCH_I2C_H__ |
13 | #define __ASM_ARCH_I2C_H__ | 13 | #define __ASM_ARCH_I2C_H__ |
14 | 14 | ||
15 | #include <linux/pm.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | |||
18 | enum { | 15 | enum { |
19 | mstatus_tdi = 0x00000001, | 16 | mstatus_tdi = 0x00000001, |
20 | mstatus_afi = 0x00000002, | 17 | mstatus_afi = 0x00000002, |
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h index e6e9c814da61..f13255e06406 100644 --- a/include/linux/i2c-pnx.h +++ b/include/linux/i2c-pnx.h | |||
@@ -12,7 +12,9 @@ | |||
12 | #ifndef __I2C_PNX_H__ | 12 | #ifndef __I2C_PNX_H__ |
13 | #define __I2C_PNX_H__ | 13 | #define __I2C_PNX_H__ |
14 | 14 | ||
15 | #include <asm/arch/i2c.h> | 15 | #include <linux/pm.h> |
16 | |||
17 | struct platform_device; | ||
16 | 18 | ||
17 | struct i2c_pnx_mif { | 19 | struct i2c_pnx_mif { |
18 | int ret; /* Return value */ | 20 | int ret; /* Return value */ |