]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Undo of accidental 24xx DMA patch
authorTony Lindgren <tony@atomide.com>
Tue, 18 Oct 2005 17:48:28 +0000 (20:48 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Oct 2005 17:48:28 +0000 (20:48 +0300)
This got added accidentally with 09b555784d53c7c75d1ea2493c878c1d96f2a00a.
The DMA merge is not ready for 24xx yet.

arch/arm/plat-omap/dma.c

index d31144f5c9f40c35171f43c269fb7dcc1d390813..76f9ed4773082c96f840bccf0ef422524fc8a736 100644 (file)
@@ -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;
        }