diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:41:31 -0700 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-09-23 10:41:28 -0500 |
| commit | 68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 (patch) | |
| tree | 919ec52758fd0b77f8e429d1eb135835532c49c7 /arch/powerpc/Kconfig.debug | |
| parent | 1e16dfc1baa745dd89b95f6e33e4142df6218066 (diff) | |
| download | blackbird-op-linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.tar.gz blackbird-op-linux-68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6.zip | |
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
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@kernel.crashing.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
0 files changed, 0 insertions, 0 deletions
