Benjamin Herrenschmidt 119b3aa65d 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>
2008-04-09 01:06:33 -04:00
..
2008-04-09 01:06:33 -04:00
2008-04-06 16:10:40 -07:00
2008-02-05 09:44:23 -08:00
2008-03-23 20:28:20 +01:00
2008-04-07 23:30:10 +02:00
2008-03-30 14:18:41 -07:00
2008-04-07 13:56:33 -07:00
2008-03-15 19:17:12 -07:00
2008-03-03 10:47:13 -08:00
2008-03-19 18:53:37 -07:00
2008-02-26 14:12:09 +09:00
2008-03-18 01:22:10 -04:00
2008-04-07 13:14:22 -07:00
2008-03-04 16:35:12 -08:00
2008-04-04 18:36:46 +02:00