git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-imx
/
devices
/
platform-mxc_nand.c
diff --git
a/arch/arm/mach-imx/devices/platform-mxc_nand.c
b/arch/arm/mach-imx/devices/platform-mxc_nand.c
index 676df4920c7b6d6e06a7e86309c5d1455a3c1648..046e0cc826c188f4357df4a50ec3649e5c89880f 100644
(file)
--- a/
arch/arm/mach-imx/devices/platform-mxc_nand.c
+++ b/
arch/arm/mach-imx/devices/platform-mxc_nand.c
@@
-6,7
+6,7
@@
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include "../hardware.h"
#include "devices-common.h"