diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:16 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:16 +0200 |
commit | 875999c5539999f61a45620aae0c3e5fb1d2b035 (patch) | |
tree | 4535032a8a10f5782c0aef6a620b1a624ea9f863 /include/asm-arm/arch-imx/dma.h | |
parent | Merge branch 'upstream' (diff) | |
parent | [PATCH] sata_sil24: enable 64bit (diff) | |
download | linux-875999c5539999f61a45620aae0c3e5fb1d2b035.tar.xz linux-875999c5539999f61a45620aae0c3e5fb1d2b035.zip |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-arm/arch-imx/dma.h')
-rw-r--r-- | include/asm-arm/arch-imx/dma.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/asm-arm/arch-imx/dma.h b/include/asm-arm/arch-imx/dma.h index b45fa367d71e..621ff2c730f2 100644 --- a/include/asm-arm/arch-imx/dma.h +++ b/include/asm-arm/arch-imx/dma.h @@ -17,27 +17,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -/* - * DMA registration - */ - typedef enum { DMA_PRIO_HIGH = 0, - DMA_PRIO_MEDIUM = 3, - DMA_PRIO_LOW = 6 + DMA_PRIO_MEDIUM = 1, + DMA_PRIO_LOW = 2 } imx_dma_prio; -int imx_request_dma(char *name, imx_dma_prio prio, - void (*irq_handler) (int, void *, struct pt_regs *), - void (*err_handler) (int, void *, struct pt_regs *), - void *data); - -void imx_free_dma(int dma_ch); - - #define DMA_REQ_UART3_T 2 #define DMA_REQ_UART3_R 3 #define DMA_REQ_SSI2_T 4 |