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
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
include
/
asm-ia64
/
dma-mapping.h
diff --git
a/include/asm-ia64/dma-mapping.h
b/include/asm-ia64/dma-mapping.h
index
a527db7
..
abe230e
100644
(file)
--- a/
include/asm-ia64/dma-mapping.h
+++ b/
include/asm-ia64/dma-mapping.h
@@
-6,7
+6,6
@@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <asm/machvec.h>
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <asm/machvec.h>
-
#ifndef CONFIG_XEN
#define dma_alloc_coherent platform_dma_alloc_coherent
#ifndef CONFIG_XEN
#define dma_alloc_coherent platform_dma_alloc_coherent
@@
-23,7
+22,6
@@
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
-
#else /* CONFIG_XEN */
/* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
#include <asm/hypervisor.h>
#else /* CONFIG_XEN */
/* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
#include <asm/hypervisor.h>