diff --git a/[refs] b/[refs] index 98b324b7f1c4..f9c100e56385 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761052e676372465fdeb97c148d5a4b0790fa8a0 +refs/heads/master: cbf3d262e0b70652d602b9c072daf1c1f29dccf0 diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 15b09b89588a..6bbacb59efb9 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -510,6 +510,7 @@ config BLK_DEV_TRIFLEX config BLK_DEV_CY82C693 tristate "CY82C693 chipset support" + depends on ALPHA select IDE_TIMINGS select BLK_DEV_IDEDMA_PCI help