summaryrefslogtreecommitdiff
path: root/drivers/ide/Kconfig
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-09-11 22:28:33 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-09-11 22:28:33 +0200
commitdc4b6fd620aec395048b2877daca87ba7bfcd5e0 (patch)
treea2d00a7384c4cba894977fe571f5ecb8b0a90ba3 /drivers/ide/Kconfig
parent0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01 (diff)
mpc8xx: Only build mpc8xx on arch/ppc
Currently the mpc8xx ide driver will only work on arch/ppc so only allow it to be built there. Also, killed a minor include that isn't actually used by the driver. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/Kconfig')
-rw-r--r--drivers/ide/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7adb61bad6ad..24ad1048e17d 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE
config BLK_DEV_MPC8xx_IDE
bool "MPC8xx IDE support"
- depends on 8xx && IDE=y && BLK_DEV_IDE=y
+ depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
select IDE_GENERIC
help
This option provides support for IDE on Motorola MPC8xx Systems.