diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /include/asm-ppc/ppc4xx_dma.h | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc/ppc4xx_dma.h')
| -rw-r--r-- | include/asm-ppc/ppc4xx_dma.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h index a415001165fa..46a086fff816 100644 --- a/include/asm-ppc/ppc4xx_dma.h +++ b/include/asm-ppc/ppc4xx_dma.h | |||
| @@ -33,9 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #define MAX_PPC4xx_DMA_CHANNELS 4 | 34 | #define MAX_PPC4xx_DMA_CHANNELS 4 |
| 35 | 35 | ||
| 36 | /* in arch/ppc/kernel/setup.c -- Cort */ | ||
| 37 | extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ; | ||
| 38 | |||
| 39 | /* | 36 | /* |
| 40 | * Function return status codes | 37 | * Function return status codes |
| 41 | * These values are used to indicate whether or not the function | 38 | * These values are used to indicate whether or not the function |