diff --git a/[refs] b/[refs] index 527e82d372c1..e2bf63061904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9d5a97fa3828e7cbc577805eba3d0a0d35dd5a0 +refs/heads/master: d80c592c38378c88c568b96963f7a98d927d05fa diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 4d2f2a6b5bdb..cf06494bb744 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -681,7 +681,7 @@ endif # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF config BLK_DEV_IDE_PMAC tristate "PowerMac on-board IDE support" - depends on PPC_PMAC && IDE=y + depends on PPC_PMAC select IDE_TIMINGS select BLK_DEV_IDEDMA_PCI help