Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 869934ad authored by Wolfram Sang's avatar Wolfram Sang Committed by Jeff Garzik
Browse files

pata_mpc52xx: driver needs BMDMA 



Found by this build-error if BMDMA is disabled:

drivers/ata/pata_mpc52xx.c: In function 'mpc52xx_ata_init_one':
drivers/ata/pata_mpc52xx.c:662: error: 'ata_bmdma_interrupt' undeclared (first use in this function)
...

Move the Kconfig entry to the proper location as needed since
9a7780c9 (libata-sff: make BMDMA optional)

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9272dcc2

drivers/ata/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -128,16 +128,6 @@ config PDC_ADMA 


	  If unsure, say N.



config PATA_MPC52xx

	tristate "Freescale MPC52xx SoC internal IDE"

	depends on PPC_MPC52xx && PPC_BESTCOMM

	select PPC_BESTCOMM_ATA

	help

	  This option enables support for integrated IDE controller

	  of the Freescale MPC52xx SoC.



	  If unsure, say N.



config PATA_OCTEON_CF

	tristate "OCTEON Boot Bus Compact Flash support"

	depends on CPU_CAVIUM_OCTEON
@@ -491,6 +481,16 @@ config PATA_MARVELL 


	  If unsure, say N.



config PATA_MPC52xx

	tristate "Freescale MPC52xx SoC internal IDE"

	depends on PPC_MPC52xx && PPC_BESTCOMM

	select PPC_BESTCOMM_ATA

	help

	  This option enables support for integrated IDE controller

	  of the Freescale MPC52xx SoC.



	  If unsure, say N.



config PATA_NETCELL

	tristate "NETCELL Revolution RAID support"

	depends on PCI

drivers/ata/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o 


# SFF w/ custom DMA

obj-$(CONFIG_PDC_ADMA)		+= pdc_adma.o

obj-$(CONFIG_PATA_MPC52xx)	+= pata_mpc52xx.o

obj-$(CONFIG_PATA_OCTEON_CF)	+= pata_octeon_cf.o

obj-$(CONFIG_SATA_QSTOR)	+= sata_qstor.o

obj-$(CONFIG_SATA_SX4)		+= sata_sx4.o
@@ -52,6 +51,7 @@ obj-$(CONFIG_PATA_IT821X) += pata_it821x.o 
obj-$(CONFIG_PATA_JMICRON)	+= pata_jmicron.o

obj-$(CONFIG_PATA_MACIO)	+= pata_macio.o

obj-$(CONFIG_PATA_MARVELL)	+= pata_marvell.o

obj-$(CONFIG_PATA_MPC52xx)	+= pata_mpc52xx.o

obj-$(CONFIG_PATA_NETCELL)	+= pata_netcell.o

obj-$(CONFIG_PATA_NINJA32)	+= pata_ninja32.o

obj-$(CONFIG_PATA_NS87415)	+= pata_ns87415.o