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
/
mx6sx_pins.h
diff --git
a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
index 5dd9a50fdfafd6e91332e5026cd62366f77306e7..86e69fd0e8d1bda430350cc6c08861a610734604 100644
(file)
--- a/
arch/arm/include/asm/arch-mx6/mx6sx_pins.h
+++ b/
arch/arm/include/asm/arch-mx6/mx6sx_pins.h
@@
-7,7
+7,7
@@
#ifndef __ASM_ARCH_MX6_MX6_PINS_H__
#define __ASM_ARCH_MX6_MX6_PINS_H__
-#include <asm/
imx-common
/iomux-v3.h>
+#include <asm/
mach-imx
/iomux-v3.h>
enum {
MX6_PAD_GPIO1_IO00__I2C1_SCL = IOMUX_PAD(0x035C, 0x0014, IOMUX_CONFIG_SION | 0, 0x07A8, 1, 0),