]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7180c4c) | patch
pata_sil680: Fix build on arch/ppc
authorBenjamin Herrenschmidt <benh@ozlabs.org>
Tue, 8 Apr 2008 21:51:07 +0000 (07:51 +1000)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Apr 2008 05:06:33 +0000 (01:06 -0400)
commit119b3aa65d33533c2f8d8822bb7a3e62aa12f860
tree84aae81374affcbbfae3288ba90e9059b8bed5c0tree | snapshot
parent7180c4c9e09888db0a188f729c96c6d7bd61fa83commit | diff
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>
drivers/ata/pata_sil680.c diff | blob | history
Linux 2.6 source tree