aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-08 10:13:27 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-08 10:13:27 -0400
commit2727f226a65e034f93846def7fab314dee430df3 (patch)
tree68af1b225c3501358ec2666bf401f165a9eee739
parent058ddee5625ade9e9e011b9ae155ac3b8d4eda3a (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.h3
-rw-r--r--include/linux/i2c-pnx.h4
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 92e8d65006f..259ac53abf4 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
18enum { 15enum {
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 e6e9c814da6..f13255e0640 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
17struct platform_device;
16 18
17struct i2c_pnx_mif { 19struct i2c_pnx_mif {
18 int ret; /* Return value */ 20 int ret; /* Return value */