diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 17:43:35 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 17:43:35 +0100 |
| commit | 08798026f24bd7c706e70372f8c323f0702c9a15 (patch) | |
| tree | f8bf5d1866393c82a96dc062814274076482a0e3 /board/wandboard | |
| parent | aadf3192f83a55dbbdb0d395ee5af88b6560edcb (diff) | |
| parent | 81a1d6173cd255c5c04c332ed69498c6e173515f (diff) | |
| download | blackbird-obmc-uboot-08798026f24bd7c706e70372f8c323f0702c9a15.tar.gz blackbird-obmc-uboot-08798026f24bd7c706e70372f8c323f0702c9a15.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/wandboard')
| -rw-r--r-- | board/wandboard/wandboard.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 050845777d..f1951dc5ef 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -25,6 +25,8 @@ #include <miiphy.h> #include <netdev.h> #include <linux/fb.h> +#include <phy.h> +#include <input.h> DECLARE_GLOBAL_DATA_PTR; @@ -55,7 +57,7 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; -iomux_v3_cfg_t const usdhc1_pads[] = { +static iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD1_DAT0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), |
