Merge source.mvista.com:/home/git/linux-omap-2.6

9a5d1946 · Tony Lindgren · 498f3eb7 · d8f5f988 · 9a5d1946
Commit 9a5d1946 authored Oct 18, 2005 by Tony Lindgren
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

arch/arm/plat-omap/dma.c arch/arm/plat-omap/dma.c +1 -3

No files found.
--- 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())
+	} else {
-		dma_chan_count = 32;
-	else {
 		dma_chan_count = 0;
 		return 0;
 	}