From 2eb5ee047f78987e7004e84c5b4fb0812bc49de9 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed, 16 Jul 2003 20:34:19 -0700
Subject: [PATCH] s390: arch update

 - New default configuration.
 - Fix get_tv32/put_tv32.
 - Replace generic dma-mapping file with empty one.
 - Remove wrong comment from dma.h.
---
 include/asm-s390/dma-mapping.h | 12 +++++++++++-
 include/asm-s390/dma.h         |  2 --
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/asm-s390/dma-mapping.h b/include/asm-s390/dma-mapping.h
index e7e16901f686..e60fba436834 100644
--- a/include/asm-s390/dma-mapping.h
+++ b/include/asm-s390/dma-mapping.h
@@ -1 +1,11 @@
-#include <asm-generic/dma-mapping.h>
+/*
+ *  include/asm-s390/dma-mapping.h
+ *
+ *  S390 version
+ *
+ *  This file exists so that #include <dma-mapping.h> doesn't break anything.
+ */
+
+#ifndef _ASM_DMA_MAPPING_H
+#define _ASM_DMA_MAPPING_H
+#endif /* _ASM_DMA_MAPPING_H */
diff --git a/include/asm-s390/dma.h b/include/asm-s390/dma.h
index ebf4afef692c..02720c449cd8 100644
--- a/include/asm-s390/dma.h
+++ b/include/asm-s390/dma.h
@@ -2,8 +2,6 @@
  *  include/asm-s390/dma.h
  *
  *  S390 version
- *
- *  This file exists so that an #include <dma.h> doesn't break anything.
  */
 
 #ifndef _ASM_DMA_H
-- 
cgit v1.2.3