1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7adb61bad6ad..4200251ff635 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -781,7 +781,7 @@ endif
 
 config BLK_DEV_IDE_PMAC
         bool "Builtin PowerMac IDE support"
-        depends on PPC_PMAC && IDE=y
+        depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y
         help
           This driver provides support for the built-in IDE controller on
           most of the recent Apple Power Macintoshes and PowerBooks.
@@ -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.