git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
stargate2.c
diff --git
a/arch/arm/mach-pxa/stargate2.c
b/arch/arm/mach-pxa/stargate2.c
index
3498a14
..
9a14fdb
100644
(file)
--- a/
arch/arm/mach-pxa/stargate2.c
+++ b/
arch/arm/mach-pxa/stargate2.c
@@
-46,11
+46,11
@@
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/udc.h>
-#include <mach/pxa2xx_spi.h>
#include <mach/pxa27x-udc.h>
#include <mach/smemc.h>
#include <linux/spi/spi.h>
#include <mach/pxa27x-udc.h>
#include <mach/smemc.h>
#include <linux/spi/spi.h>
+#include <linux/spi/pxa2xx_spi.h>
#include <linux/mfd/da903x.h>
#include <linux/sht15.h>
#include <linux/mfd/da903x.h>
#include <linux/sht15.h>