diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-13 10:47:27 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-13 10:47:43 +0200 |
commit | d66d79eefbeb6b1683cd9494b5c2044d87bb9e45 (patch) | |
tree | bf59c337b38846183655229fd1b470aa8af00624 /arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c | |
parent | ed921b0401ba85bdbd37a72b76bdeccb52d872de (diff) | |
parent | b346a85b941173f3c2b8b044aa2bd5405a04bc76 (diff) | |
download | barebox-d66d79eefbeb6b1683cd9494b5c2044d87bb9e45.tar.gz barebox-d66d79eefbeb6b1683cd9494b5c2044d87bb9e45.tar.xz |
Merge branch 'work/iomux-v3' into next
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c')
-rw-r--r-- | arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 06a994aa23..2bda9743df 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c @@ -52,7 +52,7 @@ struct imx_nand_platform_data nand_info = { .flash_bbt = 1, }; -static struct pad_desc eukrea_cpuimx51_pads[] = { +static iomux_v3_cfg_t eukrea_cpuimx51_pads[] = { /* FEC */ MX51_PAD_DISP2_DAT1__FEC_RX_ER, MX51_PAD_DISP2_DAT15__FEC_TDATA0, |