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> |
||
---|---|---|
.. | ||
aoe | ||
paride | ||
DAC960.c | ||
DAC960.h | ||
Kconfig | ||
Makefile | ||
amiflop.c | ||
ataflop.c | ||
brd.c | ||
cciss.c | ||
cciss.h | ||
cciss_cmd.h | ||
cciss_scsi.c | ||
cciss_scsi.h | ||
cpqarray.c | ||
cpqarray.h | ||
cryptoloop.c | ||
floppy.c | ||
hd.c | ||
ida_cmd.h | ||
ida_ioctl.h | ||
loop.c | ||
nbd.c | ||
pktcdvd.c | ||
ps3disk.c | ||
smart1,2.h | ||
sunvdc.c | ||
swim3.c | ||
sx8.c | ||
ub.c | ||
umem.c | ||
umem.h | ||
viodasd.c | ||
virtio_blk.c | ||
xd.c | ||
xd.h | ||
xen-blkfront.c | ||
xsysace.c | ||
z2ram.c |