git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
ppc4xx_dma.h
diff --git
a/include/asm-ppc/ppc4xx_dma.h
b/include/asm-ppc/ppc4xx_dma.h
index
8636cdb
..
935d1e0
100644
(file)
--- a/
include/asm-ppc/ppc4xx_dma.h
+++ b/
include/asm-ppc/ppc4xx_dma.h
@@
-24,7
+24,6
@@
#ifndef __ASMPPC_PPC4xx_DMA_H
#define __ASMPPC_PPC4xx_DMA_H
#ifndef __ASMPPC_PPC4xx_DMA_H
#define __ASMPPC_PPC4xx_DMA_H
-#include <linux/config.h>
#include <linux/types.h>
#include <asm/mmu.h>
#include <asm/ibm4xx.h>
#include <linux/types.h>
#include <asm/mmu.h>
#include <asm/ibm4xx.h>
@@
-33,9
+32,6
@@
#define MAX_PPC4xx_DMA_CHANNELS 4
#define MAX_PPC4xx_DMA_CHANNELS 4
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
-
/*
* Function return status codes
* These values are used to indicate whether or not the function
/*
* Function return status codes
* These values are used to indicate whether or not the function
@@
-285,7
+281,7
@@
typedef uint32_t sgl_handle_t;
#define GET_DMA_POLARITY(chan) (DMAReq_ActiveLow(chan) | DMAAck_ActiveLow(chan) | EOT_ActiveLow(chan))
#define GET_DMA_POLARITY(chan) (DMAReq_ActiveLow(chan) | DMAAck_ActiveLow(chan) | EOT_ActiveLow(chan))
-#elif defined(CONFIG_STB
XXX_DMA)
/* stb03xxx */
+#elif defined(CONFIG_STB
03xxx)
/* stb03xxx */
#define DMA_PPC4xx_SIZE 4096
#define DMA_PPC4xx_SIZE 4096