diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-pxa/poodle.c | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
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 */ |