summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-omap3/sys_proto.h
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-26 01:34:44 +0000
committerStefano Babic <sbabic@denx.de>2013-04-28 11:15:06 +0200
commitd73b97604bf5f08c547c168af89ae85fbf096762 (patch)
treea64f945d02f4736882d02c1766b4163032c7f0c4 /arch/arm/include/asm/arch-omap3/sys_proto.h
parenteec3f0242df7b96a4dc207515050c20ebaddabb2 (diff)
downloadblackbird-obmc-uboot-d73b97604bf5f08c547c168af89ae85fbf096762.tar.gz
blackbird-obmc-uboot-d73b97604bf5f08c547c168af89ae85fbf096762.zip
imx: iomux-v3: Fix common pad control definitions
Commit dc88403 "iomux-v3: Place pad control definitions into common file" broke mx51_efikamx because it made i.MX6's pad control definitions conflict with i.MX51's. i.MX51's pad control definitions are actually common to some other i.MX (25/35/53), so move them to the common iomux-v3.h (just like what is done in Linux's), and select the correct definitions depending on whether CONFIG_MX6 is defined or not. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'arch/arm/include/asm/arch-omap3/sys_proto.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud