diff options
| author |   Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:47:33 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2008-09-29 00:28:02 -0400 |
| commit | 47d692a946f12c299c21536fff6b39369311f002 (patch) | |
| tree | 6b104571f6b351155a20f6d1d79da7244a3ea3ee /drivers/ata/pata_bf54x.c | |
| parent | libata: Implement disk shock protection support (diff) | |
| download | linux-dev-47d692a946f12c299c21536fff6b39369311f002.tar.xz linux-dev-47d692a946f12c299c21536fff6b39369311f002.zip | |
pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_bf54x.c')
0 files changed, 0 insertions, 0 deletions