tree 84aae81374affcbbfae3288ba90e9059b8bed5c0
parent 7180c4c9e09888db0a188f729c96c6d7bd61fa83
author Benjamin Herrenschmidt <benh@ozlabs.org> 1207691467 +1000
committer Jeff Garzik <jeff@garzik.org> 1207717593 -0400

pata_sil680: Fix build on arch/ppc

Commit 0f436eff54f90419ac1b8accfb3e6e17c4b49a4e breaks build on
arch/ppc as it doesn't implement the machine_is() macro.

This fixes it by using CONFIG_PPC_MERGE instead which represents
arch/powerpc only, while CONFIG_PPC is set for both.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>