[PATCH] powerpc: Remove use of CONFIG_PPC_MERGE

[Grant Likely]

On Fri, Aug 1, 2008 at 9:50 AM, Kumar Gala <galak at kernel.crashing.org> wrote:
> Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore
> remove the dead code associated with !CONFIG_PPC_MERGE out of arch/powerpc
> and include/asm-powerpc.
>
> Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

You need to remove references to it from drivers also

drivers/ata/pata_sil680.c
233:#ifdef CONFIG_PPC_MERGE

drivers/block/floppy.c
4168:#if defined(CONFIG_PPC_MERGE)

drivers/char/ipmi/ipmi_si_intf.c
2703:#ifdef CONFIG_PPC_MERGE

drivers/i2c/busses/i2c-pca-isa.c
116:#ifdef CONFIG_PPC_MERGE

drivers/input/serio/i8042-io.h
70:#if defined(CONFIG_PPC_MERGE)

drivers/usb/host/ehci-hcd.c
1017:#if defined(CONFIG_440EPX) && !defined(CONFIG_PPC_MERGE)

drivers/usb/host/ehci.h
748:#if defined(CONFIG_PPC) && !defined(CONFIG_PPC_MERGE)

drivers/usb/host/ohci.h
536:#if defined(CONFIG_PPC) && !defined(CONFIG_PPC_MERGE)

drivers/net/fs_enet/mac-fec.c
316:#ifndef CONFIG_PPC_MERGE
418:#ifndef CONFIG_PPC_MERGE

drivers/net/fs_enet/mac-scc.c
376:#ifndef CONFIG_PPC_MERGE

drivers/pnp/isapnp/core.c
1015:#ifdef CONFIG_PPC_MERGE

drivers/pnp/pnpbios/core.c
522:#if defined(CONFIG_PPC_MERGE)
580:#if defined(CONFIG_PPC_MERGE)

drivers/serial/mpc52xx_uart.c
76:#if defined(CONFIG_PPC_MERGE)
110:#if defined(CONFIG_PPC_MERGE)
258:#if defined(CONFIG_PPC_MERGE)
889:#if !defined(CONFIG_PPC_MERGE)
949:#if !defined(CONFIG_PPC_MERGE)
1056:#endif /* defined(CONFIG_PPC_MERGE) */
1075:#if defined(CONFIG_PPC_MERGE)
1104:#if !defined(CONFIG_PPC_MERGE)
1208:#endif /* !defined(CONFIG_PPC_MERGE) */
1211:#if defined(CONFIG_PPC_MERGE)
1405:#endif /* defined(CONFIG_PPC_MERGE) */
1426:#if defined(CONFIG_PPC_MERGE)
1453:#if defined(CONFIG_PPC_MERGE)

drivers/spi/mpc52xx_psc_spi.c
19:#if defined(CONFIG_PPC_MERGE)
474:#if !defined(CONFIG_PPC_MERGE)
519:#else	/* defined(CONFIG_PPC_MERGE) */
589:#endif	/* defined(CONFIG_PPC_MERGE) */


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.