diff options
author | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
commit | 1ad6364eeb4f578e423081d1748e8a3fdf1ab01d (patch) | |
tree | f55731737edf1cfd653b21f2ff9d387e6c53ae24 /board/boundary/nitrogen6x | |
parent | 335143c76612a0ae26eef8abeda77641d4f63b50 (diff) | |
parent | cc07294bc704694ae33db75b25ac557e5917a83f (diff) | |
download | u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.gz u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.xz u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/boundary/nitrogen6x')
-rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 3f4cfa1a29..d9c05b07bf 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -389,7 +389,7 @@ int board_eth_init(bd_t *bis) } #endif -#ifdef CONFIG_MV_UDC +#ifdef CONFIG_CI_UDC /* For otg ethernet*/ usb_eth_initialize(bis); #endif |