diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:10:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:10:25 +0100 |
| commit | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (patch) | |
| tree | db166579758930f52a1a625eb872bd96bd7ff88e /arch/arm/mach-pxa/poodle.c | |
| parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| parent | [ARM] pxa/cm-x300: fix ffuart registration (diff) | |
| download | linux-dev-f165eb77f49cb6f6e86e2f2f09183904b2965d19.tar.xz linux-dev-f165eb77f49cb6f6e86e2f2f09183904b2965d19.zip | |
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 @@ #include <mach/irda.h> #include <mach/poodle.h> #include <mach/pxafb.h> -#include <mach/sharpsl.h> #include <mach/pxa2xx_spi.h> #include <plat/i2c.h> @@ -53,7 +52,6 @@ #include "generic.h" #include "devices.h" -#include "sharpsl.h" static unsigned long poodle_pin_config[] __initdata = { /* I/O */ |