projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-pxa
/
lubbock.c
diff --git
a/arch/arm/mach-pxa/lubbock.c
b/arch/arm/mach-pxa/lubbock.c
index d3375486c8cdf7626743886ab25718557baa6c5a..3072dbea5c1f7da4d8524bceaa6f2f8f09f2ce9f 100644
(file)
--- a/
arch/arm/mach-pxa/lubbock.c
+++ b/
arch/arm/mach-pxa/lubbock.c
@@
-25,7
+25,7
@@
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
-#include <
mach
/pxa2xx_spi.h>
+#include <
linux/spi
/pxa2xx_spi.h>
#include <asm/setup.h>
#include <asm/memory.h>