diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /arch/m68knommu/platform/coldfire/dma.c | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
download | linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.xz |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'arch/m68knommu/platform/coldfire/dma.c')
-rw-r--r-- | arch/m68knommu/platform/coldfire/dma.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/m68knommu/platform/coldfire/dma.c b/arch/m68knommu/platform/coldfire/dma.c deleted file mode 100644 index e88b95e2cc62..000000000000 --- a/arch/m68knommu/platform/coldfire/dma.c +++ /dev/null @@ -1,39 +0,0 @@ -/***************************************************************************/ - -/* - * dma.c -- Freescale ColdFire DMA support - * - * Copyright (C) 2007, Greg Ungerer (gerg@snapgear.com) - */ - -/***************************************************************************/ - -#include <linux/kernel.h> -#include <asm/dma.h> -#include <asm/coldfire.h> -#include <asm/mcfsim.h> -#include <asm/mcfdma.h> - -/***************************************************************************/ - -/* - * DMA channel base address table. - */ -unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = { -#ifdef MCFDMA_BASE0 - MCFDMA_BASE0, -#endif -#ifdef MCFDMA_BASE1 - MCFDMA_BASE1, -#endif -#ifdef MCFDMA_BASE2 - MCFDMA_BASE2, -#endif -#ifdef MCFDMA_BASE3 - MCFDMA_BASE3, -#endif -}; - -unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS]; - -/***************************************************************************/ |