From b24c09d0f6ecd7502056e92971aa8d34991710e5 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 6 Jan 2009 14:42:42 -0800
Subject: [PATCH] --- yaml --- r: 126398 b: refs/heads/master c:
 58cc855c395fc22db996cc893134c4c690f0f0dc h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/s390/Debugging390.txt | 2 +-
 trunk/Documentation/s390/cds.txt          | 2 +-
 trunk/Documentation/s390/s390dbf.txt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 263aebd5d79c..befa50b4db1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07983f0e36eab01a5385117e55154a2aa796eafc
+refs/heads/master: 58cc855c395fc22db996cc893134c4c690f0f0dc
diff --git a/trunk/Documentation/s390/Debugging390.txt b/trunk/Documentation/s390/Debugging390.txt
index d30a281c570f..10711d9f0788 100644
--- a/trunk/Documentation/s390/Debugging390.txt
+++ b/trunk/Documentation/s390/Debugging390.txt
@@ -1402,7 +1402,7 @@ Syscalls are implemented on Linux for S390 by the Supervisor call instruction (S
 possibilities of these as the instruction is made up of a  0xA opcode & the second byte being
 the syscall number. They are traced using the simple command.
 TR SVC  <Optional value or range>
-the syscalls are defined in linux/include/asm-s390/unistd.h
+the syscalls are defined in linux/arch/s390/include/asm/unistd.h
 e.g. to trace all file opens just do
 TR SVC 5 ( as this is the syscall number of open )
 
diff --git a/trunk/Documentation/s390/cds.txt b/trunk/Documentation/s390/cds.txt
index c4b7b2bd369a..480a78ef5a1e 100644
--- a/trunk/Documentation/s390/cds.txt
+++ b/trunk/Documentation/s390/cds.txt
@@ -98,7 +98,7 @@ platform. Some of the interface routines are specific to Linux/390 and some
 of them can be found on other Linux platforms implementations too.
 Miscellaneous function prototypes, data declarations, and macro definitions
 can be found in the architecture specific C header file
-linux/include/asm-s390/irq.h.
+linux/arch/s390/include/asm/irq.h.
 
 Overview of CDS interface concepts
 
diff --git a/trunk/Documentation/s390/s390dbf.txt b/trunk/Documentation/s390/s390dbf.txt
index e05420973698..2d10053dd97e 100644
--- a/trunk/Documentation/s390/s390dbf.txt
+++ b/trunk/Documentation/s390/s390dbf.txt
@@ -2,7 +2,7 @@ S390 Debug Feature
 ==================
 
 files: arch/s390/kernel/debug.c
-       include/asm-s390/debug.h
+       arch/s390/include/asm/debug.h
 
 Description:
 ------------