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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-arm
/
dma.h
diff --git
a/include/asm-arm/dma.h
b/include/asm-arm/dma.h
index
0dee33c
..
ef41df4
100644
(file)
--- a/
include/asm-arm/dma.h
+++ b/
include/asm-arm/dma.h
@@
-6,7
+6,6
@@
typedef unsigned int dmach_t;
#include <linux/config.h>
#include <linux/spinlock.h>
#include <asm/system.h>
#include <linux/config.h>
#include <linux/spinlock.h>
#include <asm/system.h>
-#include <asm/memory.h>
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
@@
-133,8
+132,4
@@
extern int isa_dma_bridge_buggy;
#define isa_dma_bridge_buggy (0)
#endif
#define isa_dma_bridge_buggy (0)
#endif
-#ifndef arch_adjust_zones
-#define arch_adjust_zones(node,size,holes)
-#endif
-
#endif /* _ARM_DMA_H */
#endif /* _ARM_DMA_H */