ARM: configs: fix duplicate entry in multi_v7
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Sep 2014 11:42:11 +0000 (13:42 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Sep 2014 11:42:11 +0000 (13:42 +0200)
Two of the recent patches each added support for CPU_FREQ, which
causes a kconfig warning:

arch/arm/configs/multi_v7_defconfig:443:warning: override: reassigning to symbol CPU_FREQ

This removes one of the two in order to avoid the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/configs/multi_v7_defconfig

Simple merge