diff --git a/[refs] b/[refs] index 299741355b5b..d1f90432c8c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e7678333a2b3bd89e3669535faa18d53a8fa054 +refs/heads/master: fc10020292c7a21d1c85a215fa266d4c7cf0f4eb diff --git a/trunk/arch/sh/drivers/dma/Kconfig b/trunk/arch/sh/drivers/dma/Kconfig index 93cc6a4fb92e..ee711431e504 100644 --- a/trunk/arch/sh/drivers/dma/Kconfig +++ b/trunk/arch/sh/drivers/dma/Kconfig @@ -10,8 +10,8 @@ config SH_DMA default n config NR_ONCHIP_DMA_CHANNELS + int depends on SH_DMA - int "Number of on-chip DMAC channels" default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R default "12" if CPU_SUBTYPE_SH7780 default "4"