From: Benjamin Herrenschmidt <benh@ozlabs.org>
Date: Tue, 8 Apr 2008 21:51:07 +0000 (+1000)
Subject: pata_sil680: Fix build on arch/ppc
X-Git-Tag: v2.6.25-rc9~33^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=119b3aa65d33533c2f8d8822bb7a3e62aa12f860;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed