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-fec.c
diff --git
a/arch/arm/mach-imx/devices/platform-fec.c
b/arch/arm/mach-imx/devices/platform-fec.c
index b403a4fe2892b3773f3b92ea6f8520b077269588..605c0af5851d1274831fa12670fb5b25272d5f3e 100644
(file)
--- a/
arch/arm/mach-imx/devices/platform-fec.c
+++ b/
arch/arm/mach-imx/devices/platform-fec.c
@@
-7,7
+7,7
@@
* Free Software Foundation.
*/
#include <linux/dma-mapping.h>
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include "../hardware.h"
#include "devices-common.h"