diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
| commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
| tree | 1b7250410f24703cd77c76156e758db9887137aa /arch/blackfin/mach-bf561/dma.c | |
| parent | ALSA: rename "Device" to "Toshiba SB-0500" via quirks (diff) | |
| parent | ALSA: usb-audio - Cache mixer values (diff) | |
| download | linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.xz linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip | |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'arch/blackfin/mach-bf561/dma.c')
| -rw-r--r-- | arch/blackfin/mach-bf561/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf561/dma.c b/arch/blackfin/mach-bf561/dma.c index 24415eb82698..42b0037afe61 100644 --- a/arch/blackfin/mach-bf561/dma.c +++ b/arch/blackfin/mach-bf561/dma.c @@ -31,7 +31,7 @@ #include <asm/blackfin.h> #include <asm/dma.h> -struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { +struct dma_register *dma_io_base_addr[MAX_DMA_CHANNELS] = { (struct dma_register *) DMA1_0_NEXT_DESC_PTR, (struct dma_register *) DMA1_1_NEXT_DESC_PTR, (struct dma_register *) DMA1_2_NEXT_DESC_PTR, |