diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 21:10:12 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 21:10:12 +0100 |
commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-pnx4008/i2c.c | |
parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-pnx4008/i2c.c')
-rw-r--r-- | arch/arm/mach-pnx4008/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c index 6f308827c4f..87c093286ff 100644 --- a/arch/arm/mach-pnx4008/i2c.c +++ b/arch/arm/mach-pnx4008/i2c.c @@ -14,8 +14,8 @@ #include <linux/i2c-pnx.h> #include <linux/platform_device.h> #include <linux/err.h> -#include <asm/arch/platform.h> -#include <asm/arch/i2c.h> +#include <mach/platform.h> +#include <mach/i2c.h> static int set_clock_run(struct platform_device *pdev) { |