]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc60c88) | 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)
commit3edbac238afa07c2dfb26d2d42cb600f3c2ec047
tree84aae81374affcbbfae3288ba90e9059b8bed5c0tree | snapshot
parentbc60c884c65b10b8c179ecf6fa388715d7cc5896commit | diff
pata_sil680: Fix build on arch/ppc

Commit 12bd480cbc596e733cd8bc2f80eea01b56d5a1b3 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 Kernel Source Tree.