The patch titled pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC has been added to the -mm tree. Its filename is pata_sil680-convert-config_ppc_merge-to-config_ppc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC From: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use CONFIG_PPC instead. Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/pata_sil680.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc drivers/ata/pata_sil680.c --- a/drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc +++ a/drivers/ata/pata_sil680.c @@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_de tmpbyte & 1, tmpbyte & 0x30); *try_mmio = 0; -#ifdef CONFIG_PPC_MERGE +#ifdef CONFIG_PPC if (machine_is(cell)) *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); #endif _ Patches currently in -mm which might be from galak@xxxxxxxxxxxxxxxxxxx are linux-next.patch usb-remove-code-associated-with-config_ppc_merge.patch fs-enet-remove-code-associated-with-config_ppc_merge.patch netdev-drop-config_ppc_merge-from-kconfig.patch rtc-use-config_ppc-instead-of-config_ppc_merge.patch serial-mpc52xx_uart-remove-code-associated-with-config_ppc_merge.patch mpc52xx_psc_spi-remove-code-associated-with-config_ppc_merge.patch powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks.patch pata_sil680-convert-config_ppc_merge-to-config_ppc.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html