diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-05 11:00:11 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-05 11:00:11 (GMT) |
commit | 3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c (patch) | |
tree | c91bddf10c0a179153e674309779e0afd4ab72ae /include | |
parent | 622da1c36aee9c39075f2109848228a5737925c0 (diff) | |
parent | b939689c7b87773c44275a578ffc8674a867e39d (diff) | |
download | u-boot-3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/zynq-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index b83e037..926b381 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -34,7 +34,6 @@ /* DCC driver */ #if defined(CONFIG_ZYNQ_DCC) # define CONFIG_ARM_DCC -# define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */ #else # define CONFIG_ZYNQ_SERIAL #endif |