diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:27:15 +0100 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:27:15 +0100 |
commit | ea393eb1d6a786fc2e895f90abb5f7e7541aef45 (patch) | |
tree | f8e264ecda76805863f9336d8c3712767984f373 /include/configs/hammerhead.h | |
parent | 32688e572ff96715b41420e9a7f280db6c399b65 (diff) | |
parent | cb5473205206c7f14cbb1e747f28ec75b48826e2 (diff) | |
download | u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.zip u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.tar.gz u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.tar.bz2 |
Merge branch 'cleanups' into next
Diffstat (limited to 'include/configs/hammerhead.h')
-rw-r--r-- | include/configs/hammerhead.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 317a3d7..0c70af5 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -117,7 +117,7 @@ #define CONFIG_ATMEL_USART 1 #define CONFIG_MACB 1 -#define CONFIG_PIO2 1 +#define CONFIG_PORTMUX_PIO 1 #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC 1 #define CONFIG_MMC 1 |