diff options
Diffstat (limited to 'drivers/ide/Kconfig')
| -rw-r--r-- | drivers/ide/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 7adb61bad6a..24ad1048e17 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. |