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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ambakmi.c | ||
| at32psif.c | ||
| ct82c710.c | ||
| gscps2.c | ||
| hil_mlc.c | ||
| hp_sdc.c | ||
| hp_sdc_mlc.c | ||
| i8042-io.h | ||
| i8042-ip22io.h | ||
| i8042-jazzio.h | ||
| i8042-ppcio.h | ||
| i8042-snirm.h | ||
| i8042-sparcio.h | ||
| i8042-x86ia64io.h | ||
| i8042.c | ||
| i8042.h | ||
| libps2.c | ||
| maceps2.c | ||
| parkbd.c | ||
| pcips2.c | ||
| q40kbd.c | ||
| rpckbd.c | ||
| sa1111ps2.c | ||
| serio.c | ||
| serio_raw.c | ||
| serport.c | ||
| xilinx_ps2.c | ||