https://github.com/torvalds/linux
Revision 119b3aa65d33533c2f8d8822bb7a3e62aa12f860 authored by Benjamin Herrenschmidt on 08 April 2008, 21:51:07 UTC, committed by Jeff Garzik on 09 April 2008, 05:06:33 UTC
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>
1 parent 7180c4c
History
Tip revision: 119b3aa65d33533c2f8d8822bb7a3e62aa12f860 authored by Benjamin Herrenschmidt on 08 April 2008, 21:51:07 UTC
pata_sil680: Fix build on arch/ppc
Tip revision: 119b3aa
File Mode Size
.gitignore -rw-r--r-- 102 bytes
Kconfig -rw-r--r-- 1.6 KB
Makefile -rw-r--r-- 1.8 KB
gen_init_cpio.c -rw-r--r-- 11.4 KB
initramfs_data.S -rw-r--r-- 1.0 KB

back to top