diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-12-22 10:50:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-12-24 13:33:37 -0500 |
| commit | 869934adfc8391ec2e198ed81260e1a42cd9c575 (patch) | |
| tree | c1bcdb5431aa08048e14376838bbe9ec75481176 /drivers | |
| parent | 9272dcc232b84ccb027d6861077934055d42764d (diff) | |
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
9a7780c9acb821fe1c2b6fc53f74cc2556ff5364 (libata-sff: make BMDMA optional)
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/Kconfig | 20 | ||||
| -rw-r--r-- | drivers/ata/Makefile | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index cfd04f4e418c..36e2319264bd 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -128,16 +128,6 @@ config PDC_ADMA | |||
| 128 | 128 | ||
| 129 | If unsure, say N. | 129 | If unsure, say N. |
| 130 | 130 | ||
| 131 | config PATA_MPC52xx | ||
| 132 | tristate "Freescale MPC52xx SoC internal IDE" | ||
| 133 | depends on PPC_MPC52xx && PPC_BESTCOMM | ||
| 134 | select PPC_BESTCOMM_ATA | ||
| 135 | help | ||
| 136 | This option enables support for integrated IDE controller | ||
| 137 | of the Freescale MPC52xx SoC. | ||
| 138 | |||
| 139 | If unsure, say N. | ||
| 140 | |||
| 141 | config PATA_OCTEON_CF | 131 | config PATA_OCTEON_CF |
| 142 | tristate "OCTEON Boot Bus Compact Flash support" | 132 | tristate "OCTEON Boot Bus Compact Flash support" |
| 143 | depends on CPU_CAVIUM_OCTEON | 133 | depends on CPU_CAVIUM_OCTEON |
| @@ -491,6 +481,16 @@ config PATA_MARVELL | |||
| 491 | 481 | ||
| 492 | If unsure, say N. | 482 | If unsure, say N. |
| 493 | 483 | ||
| 484 | config PATA_MPC52xx | ||
| 485 | tristate "Freescale MPC52xx SoC internal IDE" | ||
| 486 | depends on PPC_MPC52xx && PPC_BESTCOMM | ||
| 487 | select PPC_BESTCOMM_ATA | ||
| 488 | help | ||
| 489 | This option enables support for integrated IDE controller | ||
| 490 | of the Freescale MPC52xx SoC. | ||
| 491 | |||
| 492 | If unsure, say N. | ||
| 493 | |||
| 494 | config PATA_NETCELL | 494 | config PATA_NETCELL |
| 495 | tristate "NETCELL Revolution RAID support" | 495 | tristate "NETCELL Revolution RAID support" |
| 496 | depends on PCI | 496 | depends on PCI |
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index c501af5b12b9..2b67c900a459 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
| @@ -11,7 +11,6 @@ obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o | |||
| 11 | 11 | ||
| 12 | # SFF w/ custom DMA | 12 | # SFF w/ custom DMA |
| 13 | obj-$(CONFIG_PDC_ADMA) += pdc_adma.o | 13 | obj-$(CONFIG_PDC_ADMA) += pdc_adma.o |
| 14 | obj-$(CONFIG_PATA_MPC52xx) += pata_mpc52xx.o | ||
| 15 | obj-$(CONFIG_PATA_OCTEON_CF) += pata_octeon_cf.o | 14 | obj-$(CONFIG_PATA_OCTEON_CF) += pata_octeon_cf.o |
| 16 | obj-$(CONFIG_SATA_QSTOR) += sata_qstor.o | 15 | obj-$(CONFIG_SATA_QSTOR) += sata_qstor.o |
| 17 | obj-$(CONFIG_SATA_SX4) += sata_sx4.o | 16 | obj-$(CONFIG_SATA_SX4) += sata_sx4.o |
| @@ -52,6 +51,7 @@ obj-$(CONFIG_PATA_IT821X) += pata_it821x.o | |||
| 52 | obj-$(CONFIG_PATA_JMICRON) += pata_jmicron.o | 51 | obj-$(CONFIG_PATA_JMICRON) += pata_jmicron.o |
| 53 | obj-$(CONFIG_PATA_MACIO) += pata_macio.o | 52 | obj-$(CONFIG_PATA_MACIO) += pata_macio.o |
| 54 | obj-$(CONFIG_PATA_MARVELL) += pata_marvell.o | 53 | obj-$(CONFIG_PATA_MARVELL) += pata_marvell.o |
| 54 | obj-$(CONFIG_PATA_MPC52xx) += pata_mpc52xx.o | ||
| 55 | obj-$(CONFIG_PATA_NETCELL) += pata_netcell.o | 55 | obj-$(CONFIG_PATA_NETCELL) += pata_netcell.o |
| 56 | obj-$(CONFIG_PATA_NINJA32) += pata_ninja32.o | 56 | obj-$(CONFIG_PATA_NINJA32) += pata_ninja32.o |
| 57 | obj-$(CONFIG_PATA_NS87415) += pata_ns87415.o | 57 | obj-$(CONFIG_PATA_NS87415) += pata_ns87415.o |
