diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (patch) | |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 /include/configs/qong.h | |
| parent | bec9cab9291bb221714d559a44fe37669a8ca604 (diff) | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/qong.h')
| -rw-r--r-- | include/configs/qong.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/qong.h b/include/configs/qong.h index 7e6718503e..64d0214e27 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -49,7 +49,7 @@ * Hardware drivers */ -#define CONFIG_MX31_UART 1 +#define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 /* FPGA */ |