diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 15:17:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 15:17:25 +0900 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /arch/arm/mach-pxa/pxa3xx.c | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 1230343d9c7..f374247b846 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -21,6 +21,7 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/sysdev.h> +#include <linux/i2c/pxa-i2c.h> #include <asm/mach/map.h> #include <mach/hardware.h> @@ -32,7 +33,6 @@ #include <mach/dma.h> #include <mach/regs-intc.h> #include <mach/smemc.h> -#include <plat/i2c.h> #include "generic.h" #include "devices.h" |