diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
| commit | ea6aa41b21de5095d17d43776c8a8c472fad9cd4 (patch) | |
| tree | b7e245793e9306d8f602c87a90c76bd0b2e7be1e /arch/arm/mach-mx6/board-mx6q_sabreauto.h | |
| parent | 7c8718a8d86182a1ea3ad6d89e2ff0201ca2a4a9 (diff) | |
| parent | 23fae65a58952ca3de64e68c13c0d3527bec6f0a (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabreauto.h')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.h b/arch/arm/mach-mx6/board-mx6q_sabreauto.h index e4d62f1baaa5..41d0c560f416 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.h +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.h @@ -208,14 +208,10 @@ static iomux_v3_cfg_t mx6q_sabreauto_pads[] = { /* HDMI */ MX6Q_PAD_EIM_A25__HDMI_TX_CEC_LINE, -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - MX6Q_PAD_GPIO_6__OBSERVE_MUX_OBSRV_INT_OUT1, -#else /* MLB150 */ MX6Q_PAD_ENET_TXD1__MLB_MLBCLK, MX6Q_PAD_GPIO_6__MLB_MLBSIG, MX6Q_PAD_GPIO_2__MLB_MLBDAT, -#endif }; static iomux_v3_cfg_t mx6q_sabreauto_can0_pads[] = { |