From: Tony Lindgren <tony@atomide.com>
Date: Tue, 18 Oct 2005 17:48:28 +0000 (+0300)
Subject: ARM: OMAP: Undo of accidental 24xx DMA patch
X-Git-Tag: v2.6.15-omap2~143^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d8f5f9882ac91cb1bf9a7ac1f7324095a8d4539c;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Undo of accidental 24xx DMA patch

This got added accidentally with 09b555784d53c7c75d1ea2493c878c1d96f2a00a.
The DMA merge is not ready for 24xx yet.
---

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index d31144f5c9f..76f9ed47730 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1038,9 +1038,7 @@ static int __init omap_init_dma(void)
 			dma_chan_count = 16;
 		} else
 			dma_chan_count = 9;
-	} else if (cpu_is_omap24xx())
-		dma_chan_count = 32;
-	else {
+	} else {
 		dma_chan_count = 0;
 		return 0;
 	}