diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/i2c/busses/i2c-davinci.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
| download | op-kernel-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip op-kernel-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/i2c/busses/i2c-davinci.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index af3846e..5d77898 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -36,10 +36,9 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <asm/hardware.h> -#include <asm/mach-types.h> +#include <mach/hardware.h> -#include <asm/arch/i2c.h> +#include <mach/i2c.h> /* ----- global defines ----------------------------------------------- */ |
