diff --git a/[refs] b/[refs] index ae3a119ab997..e8a7e9d368c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718f041835f383780fd45b8424fffa586be6e1f7 +refs/heads/master: 51a2301e719e42b370bbb258c7ef6a7e7590b390 diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig index 1e2dd6f5e4b0..1537e0d86192 100644 --- a/trunk/drivers/serial/Kconfig +++ b/trunk/drivers/serial/Kconfig @@ -707,7 +707,7 @@ choice config SERIAL_BFIN_DMA bool "DMA mode" - depends on !DMA_UNCACHED_NONE && !KGDB_SERIAL_CONSOLE + depends on !DMA_UNCACHED_NONE && KGDB_SERIAL_CONSOLE=n help This driver works under DMA mode. If this option is selected, the blackfin simple dma driver is also enabled.