projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-mx6
/
mx6sl_pins.h
diff --git
a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h
b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h
index 919d83dd90cf6ac53d204d7e40a063d37a60dd51..158e47cd3bc0e71ed010d49e1a359ba4c8d1b0f5 100644
(file)
--- a/
arch/arm/include/asm/arch-mx6/mx6sl_pins.h
+++ b/
arch/arm/include/asm/arch-mx6/mx6sl_pins.h
@@
-7,7
+7,7
@@
#ifndef __ASM_ARCH_MX6_MX6SL_PINS_H__
#define __ASM_ARCH_MX6_MX6SL_PINS_H__
-#include <asm/
imx-common
/iomux-v3.h>
+#include <asm/
mach-imx
/iomux-v3.h>
enum {
MX6_PAD_ECSPI1_MISO__ECSPI_MISO = IOMUX_PAD(0x0358, 0x0068, 0, 0x0684, 0, 0),