From: Paul Mundt Date: Fri, 20 Jul 2007 05:24:57 +0000 (+0900) Subject: sh: Make on-chip DMA channel selection explicit. X-Git-Tag: v2.6.23-rc1~214^2~7 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc10020292c7a21d1c85a215fa266d4c7cf0f4eb;p=linux-2.6 sh: Make on-chip DMA channel selection explicit. Currently this has a prompt to allow users to change it. There's no reason to do this, and it has caused breakage and confusion in the past, so remove it entirely. We'll get rid of this when the whole driver is tidied for the driver model. Signed-off-by: Paul Mundt --- diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index 93cc6a4fb9..ee711431e5 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/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"