projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/cleanup' into HEAD
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-omap2-mcspi.c
diff --git
a/drivers/spi/spi-omap2-mcspi.c
b/drivers/spi/spi-omap2-mcspi.c
index
569714e
..
5d59a69
100644
(file)
--- a/
drivers/spi/spi-omap2-mcspi.c
+++ b/
drivers/spi/spi-omap2-mcspi.c
@@
-42,7
+42,7
@@
#include <linux/spi/spi.h>
#include <plat/clock.h>
-#include <
plat/
mcspi.h>
+#include <
linux/platform_data/spi-omap2-
mcspi.h>
#define OMAP2_MCSPI_MAX_FREQ 48000000
#define SPI_AUTOSUSPEND_TIMEOUT 2000