Kumar Gala 47d692a946 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>		2008-09-29 00:28:02 -04:00
..
ahci.c	libata: Implement disk shock protection support	2008-09-29 00:27:54 -04:00
ata_generic.c
ata_piix.c	ata_piix: drop merged SCR access and use slave_link instead	2008-09-29 00:25:32 -04:00
Kconfig	PATA: RPC now selects HAVE_PATA_PLATFORM for pata platform driver	2008-09-29 00:25:43 -04:00
libata-acpi.c
libata-core.c	libata: Implement disk shock protection support	2008-09-29 00:27:54 -04:00
libata-eh.c	libata: Implement disk shock protection support	2008-09-29 00:27:54 -04:00
libata-pmp.c
libata-scsi.c	libata: Implement disk shock protection support	2008-09-29 00:27:54 -04:00
libata-sff.c	libata-sff: kill spurious WARN_ON() in ata_hsm_move()	2008-09-08 12:15:38 -04:00
libata.h	libata: implement slave_link	2008-09-29 00:25:28 -04:00
Makefile
pata_acpi.c	libata: Fix a large collection of DMA mode mismatches	2008-08-22 02:27:49 -04:00
pata_ali.c	pata_ali: misplaced pci_dev_put()	2008-07-31 01:38:19 -04:00
pata_amd.c
pata_artop.c
pata_at32.c	avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>	2008-08-05 14:36:57 +02:00
pata_atiixp.c	libata: Fix a large collection of DMA mode mismatches	2008-08-22 02:27:49 -04:00
pata_bf54x.c
pata_cmd64x.c
pata_cmd640.c
pata_cs5520.c
pata_cs5530.c	libata: Fix a large collection of DMA mode mismatches	2008-08-22 02:27:49 -04:00
pata_cs5535.c
pata_cs5536.c
pata_cypress.c
pata_efar.c
pata_hpt3x2n.c
pata_hpt3x3.c
pata_hpt37x.c
pata_hpt366.c
pata_icside.c
pata_isapnp.c
pata_it821x.c	[libata] pata_it821x: fix warning	2008-08-22 02:33:23 -04:00
pata_it8213.c
pata_ixp4xx_cf.c	[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*	2008-07-27 09:46:18 +01:00
pata_jmicron.c
pata_legacy.c
pata_marvell.c	ahci, pata_marvell: play nicely together	2008-09-08 12:11:36 -04:00
pata_mpc52xx.c
pata_mpiix.c
pata_netcell.c
pata_ninja32.c
pata_ns87410.c
pata_ns87415.c
pata_of_platform.c
pata_oldpiix.c	libata: Fix a large collection of DMA mode mismatches	2008-08-22 02:27:49 -04:00
pata_opti.c
pata_optidma.c
pata_pcmcia.c
pata_pdc202xx_old.c
pata_pdc2027x.c
pata_platform.c
pata_qdi.c
pata_radisys.c
pata_rb532_cf.c
pata_rz1000.c
pata_sc1200.c	libata: Fix a large collection of DMA mode mismatches	2008-08-22 02:27:49 -04:00
pata_scc.c
pata_sch.c
pata_serverworks.c
pata_sil680.c	pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC	2008-09-29 00:28:02 -04:00
pata_sis.c
pata_sl82c105.c
pata_triflex.c
pata_via.c	pata_via: clean up recent tf_load changes	2008-08-22 02:19:54 -04:00
pata_winbond.c
pdc_adma.c
sata_fsl.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_inic162x.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_mv.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_nv.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_promise.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_promise.h
sata_qstor.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_sil24.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_sil.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_sis.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_svw.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_sx4.c
sata_uli.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_via.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sata_vsc.c	libata: make SCR access ops per-link	2008-09-29 00:22:28 -04:00
sis.h