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 7adb61bad6ad..24ad1048e17d 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE | |||
| 946 | 946 | ||
| 947 | config BLK_DEV_MPC8xx_IDE | 947 | config BLK_DEV_MPC8xx_IDE |
| 948 | bool "MPC8xx IDE support" | 948 | bool "MPC8xx IDE support" |
| 949 | depends on 8xx && IDE=y && BLK_DEV_IDE=y | 949 | depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE |
| 950 | select IDE_GENERIC | 950 | select IDE_GENERIC |
| 951 | help | 951 | help |
| 952 | This option provides support for IDE on Motorola MPC8xx Systems. | 952 | This option provides support for IDE on Motorola MPC8xx Systems. |