diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /arch/blackfin/mach-bf537/dma.c | |
| parent | net: arp_ioctl() must hold RTNL (diff) | |
| parent | fix a shutdown regression in intel_idle (diff) | |
| download | linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/blackfin/mach-bf537/dma.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/dma.c b/arch/blackfin/mach-bf537/dma.c index 5c8c4ed517bb..5c62e99c9fac 100644 --- a/arch/blackfin/mach-bf537/dma.c +++ b/arch/blackfin/mach-bf537/dma.c @@ -11,7 +11,7 @@ #include <asm/blackfin.h> #include <asm/dma.h> -struct dma_register *dma_io_base_addr[MAX_DMA_CHANNELS] = { +struct dma_register * const dma_io_base_addr[MAX_DMA_CHANNELS] = { (struct dma_register *) DMA0_NEXT_DESC_PTR, (struct dma_register *) DMA1_NEXT_DESC_PTR, (struct dma_register *) DMA2_NEXT_DESC_PTR, |