diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-05 07:00:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-05 07:00:11 -0400 |
| commit | 3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c (patch) | |
| tree | c91bddf10c0a179153e674309779e0afd4ab72ae /drivers | |
| parent | 622da1c36aee9c39075f2109848228a5737925c0 (diff) | |
| parent | b939689c7b87773c44275a578ffc8674a867e39d (diff) | |
| download | u-boot-imx-3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c.zip u-boot-imx-3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c.tar.gz u-boot-imx-3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/arm_dcc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c index 5dfb02f..e777737 100644 --- a/drivers/serial/arm_dcc.c +++ b/drivers/serial/arm_dcc.c @@ -29,9 +29,9 @@ #include <common.h> #include <serial.h> -#if defined(CONFIG_CPU_V6) +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) /* - * ARMV6 + * ARMV6 & ARMV7 */ #define DCC_RBIT (1 << 30) #define DCC_WBIT (1 << 29) |