diff --git a/[refs] b/[refs] index d2589d0fd7c1..29c00672d6e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e5b24431b58d821502bb56e67af3e74854feaf2 +refs/heads/master: eaa854902aaeeade4a28cc8987de2b2ce182003b diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig index 87665d7df6f2..ed438bc7e98d 100644 --- a/trunk/drivers/serial/Kconfig +++ b/trunk/drivers/serial/Kconfig @@ -624,7 +624,7 @@ choice config SERIAL_BFIN_DMA bool "DMA mode" - depends on DMA_UNCACHED_1M && !KGDB_UART + depends on !DMA_UNCACHED_NONE && !KGDB_UART help This driver works under DMA mode. If this option is selected, the blackfin simple dma driver is also enabled.