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-parisc
/
dma-mapping.h
diff --git
a/include/asm-parisc/dma-mapping.h
b/include/asm-parisc/dma-mapping.h
index
74d4ac6
..
66f0b40
100644
(file)
--- a/
include/asm-parisc/dma-mapping.h
+++ b/
include/asm-parisc/dma-mapping.h
@@
-1,7
+1,6
@@
#ifndef _PARISC_DMA_MAPPING_H
#define _PARISC_DMA_MAPPING_H
#ifndef _PARISC_DMA_MAPPING_H
#define _PARISC_DMA_MAPPING_H
-#include <linux/config.h>
#include <linux/mm.h>
#include <asm/cacheflush.h>
#include <asm/scatterlist.h>
#include <linux/mm.h>
#include <asm/cacheflush.h>
#include <asm/scatterlist.h>
@@
-192,13
+191,13
@@
dma_get_cache_alignment(void)
}
static inline int
}
static inline int
-dma_is_consistent(dma_addr_t dma_addr)
+dma_is_consistent(
struct device *dev,
dma_addr_t dma_addr)
{
return (hppa_dma_ops->dma_sync_single_for_cpu == NULL);
}
static inline void
{
return (hppa_dma_ops->dma_sync_single_for_cpu == NULL);
}
static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(
struct device *dev,
void *vaddr, size_t size,
enum dma_data_direction direction)
{
if(hppa_dma_ops->dma_sync_single_for_cpu)
enum dma_data_direction direction)
{
if(hppa_dma_ops->dma_sync_single_for_cpu)