Merge tag 'mvebu-cleanup-4.6-1' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Mon, 8 Feb 2016 21:53:27 +0000 (13:53 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 8 Feb 2016 21:53:27 +0000 (13:53 -0800)
commit915c7ce8ad9a7b2ea6f1e91d9a52ce605578e8bf
tree6d46386814fbba34ec487ada0b04880fc8535d88
parent8527cfce6e15bc6764d13fd28dd2d836345cb89d
parent727c62d29c3a0b982fb72ef993db95e9d2036e07
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>