Merge tag 'mvebu-cleanup-4.6-1' of git://git.infradead.org/linux-mvebu into next/cleanup

mvebu cleanup for 4.6 (part 1)

use "depends on" instead of "if" after prompt for mv78xx0

* tag 'mvebu-cleanup-4.6-1' of git://git.infradead.org/linux-mvebu

:
  ARM: mv78xx0: use "depends on" instead of "if" after prompt

Signed-off-by: Olof Johansson <olof@lixom.net>