diff --git a/[refs] b/[refs] index 8c432b699351..5cfa801a8da7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f8befa1d1fd86cac8221785a85943dfbdef4773 +refs/heads/master: d292b00031369feb7bc6b4a14e434379fb2dbb01 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index e37e993431b9..be54e36e8b69 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -739,13 +739,12 @@ config BFIN_GPTIMERS config BFIN_DMA_5XX bool "Enable DMA Support" - depends on (BF52x || BF53x || BF561 || BF54x || BF538 || BF539) default y help - DMA driver for BF5xx. + DMA driver for Blackfin parts. choice - prompt "Uncached SDRAM region" + prompt "Uncached DMA region" default DMA_UNCACHED_1M depends on BFIN_DMA_5XX config DMA_UNCACHED_4M