From: "Grant Likely" <grant.likely@secretlab.ca>
To: "Kumar Gala" <galak@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] powerpc: Remove use of CONFIG_PPC_MERGE
Date: Fri, 1 Aug 2008 10:30:03 -0600 [thread overview]
Message-ID: <fa686aa40808010930s286381c7ub354b9b98a40c07d@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0808011050370.2074@blarg.am.freescale.net>
On Fri, Aug 1, 2008 at 9:50 AM, Kumar Gala <galak@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@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.
next prev parent reply other threads:[~2008-08-01 16:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 15:50 [PATCH] powerpc: Remove use of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:30 ` Grant Likely [this message]
2008-08-01 16:35 ` Kumar Gala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa686aa40808010930s286381c7ub354b9b98a40c07d@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).