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-01-23 05:24:17 -05:00
2008-03-18 00:26:07 -04:00
2008-02-25 17:29:35 -05:00
2008-04-04 02:43:38 -04:00
2008-02-15 13:51:24 -05:00
2008-02-03 17:08:11 +02:00
2007-10-20 01:02:48 +02:00
2008-02-03 17:08:11 +02:00
2007-11-23 19:33:27 -05:00
2008-02-03 17:08:11 +02:00
2008-01-31 11:25:51 +11:00
2008-02-11 14:30:07 -05:00
2008-02-15 13:51:22 -05:00
2008-02-03 17:08:11 +02:00
2008-01-23 05:24:17 -05:00
2008-01-23 05:24:14 -05:00
2008-01-23 05:24:15 -05:00
2008-01-23 05:24:14 -05:00
2008-01-23 05:24:10 -05:00
2008-01-23 05:24:15 -05:00
2007-07-02 10:17:42 -04:00