68e1ee62f0
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> |
||
|---|---|---|
| .. | ||
| isapnp | ||
| pnpacpi | ||
| pnpbios | ||
| Kconfig | ||
| Makefile | ||
| base.h | ||
| card.c | ||
| core.c | ||
| driver.c | ||
| interface.c | ||
| manager.c | ||
| quirks.c | ||
| resource.c | ||
| support.c | ||
| system.c | ||