diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
| commit | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (patch) | |
| tree | db166579758930f52a1a625eb872bd96bd7ff88e /arch/arm/mach-pxa/poodle.c | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
| parent | a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
| -rw-r--r-- | arch/arm/mach-pxa/poodle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index bc2758b54446..55e8fcde0141 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <mach/irda.h> | 43 | #include <mach/irda.h> |
| 44 | #include <mach/poodle.h> | 44 | #include <mach/poodle.h> |
| 45 | #include <mach/pxafb.h> | 45 | #include <mach/pxafb.h> |
| 46 | #include <mach/sharpsl.h> | ||
| 47 | #include <mach/pxa2xx_spi.h> | 46 | #include <mach/pxa2xx_spi.h> |
| 48 | #include <plat/i2c.h> | 47 | #include <plat/i2c.h> |
| 49 | 48 | ||
| @@ -53,7 +52,6 @@ | |||
| 53 | 52 | ||
| 54 | #include "generic.h" | 53 | #include "generic.h" |
| 55 | #include "devices.h" | 54 | #include "devices.h" |
| 56 | #include "sharpsl.h" | ||
| 57 | 55 | ||
| 58 | static unsigned long poodle_pin_config[] __initdata = { | 56 | static unsigned long poodle_pin_config[] __initdata = { |
| 59 | /* I/O */ | 57 | /* I/O */ |