From e774d03c6821527abde684986753edb2dd92541f Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Mon, 8 Oct 2012 03:26:54 +0100
Subject: [PATCH] --- yaml --- r: 332958 b: refs/heads/master c:
 382d95fdfa7ff5c54f6495c597c7cf6d124e404b h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/um/include/{shared => asm}/sysrq.h |  0
 trunk/arch/um/kernel/sysrq.c                  |  2 +-
 trunk/arch/x86/um/sysrq_32.c                  | 12 ++++++------
 trunk/arch/x86/um/sysrq_64.c                  |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename trunk/arch/um/include/{shared => asm}/sysrq.h (100%)

diff --git a/[refs] b/[refs]
index 81838ea871bd..7592a484e22e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8813f67439524ab54978b011c51665e1854a64b5
+refs/heads/master: 382d95fdfa7ff5c54f6495c597c7cf6d124e404b
diff --git a/trunk/arch/um/include/shared/sysrq.h b/trunk/arch/um/include/asm/sysrq.h
similarity index 100%
rename from trunk/arch/um/include/shared/sysrq.h
rename to trunk/arch/um/include/asm/sysrq.h
diff --git a/trunk/arch/um/kernel/sysrq.c b/trunk/arch/um/kernel/sysrq.c
index 0960de54495a..e562ff80409a 100644
--- a/trunk/arch/um/kernel/sysrq.c
+++ b/trunk/arch/um/kernel/sysrq.c
@@ -7,7 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
-#include "sysrq.h"
+#include <asm/sysrq.h>
 
 /* Catch non-i386 SUBARCH's. */
 #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT)
diff --git a/trunk/arch/x86/um/sysrq_32.c b/trunk/arch/x86/um/sysrq_32.c
index 2d5cc51e9bef..c9bee5b8c0d3 100644
--- a/trunk/arch/x86/um/sysrq_32.c
+++ b/trunk/arch/x86/um/sysrq_32.c
@@ -3,12 +3,12 @@
  * Licensed under the GPL
  */
 
-#include "linux/kernel.h"
-#include "linux/smp.h"
-#include "linux/sched.h"
-#include "linux/kallsyms.h"
-#include "asm/ptrace.h"
-#include "sysrq.h"
+#include <linux/kernel.h>
+#include <linux/smp.h>
+#include <linux/sched.h>
+#include <linux/kallsyms.h>
+#include <asm/ptrace.h>
+#include <asm/sysrq.h>
 
 /* This is declared by <linux/sched.h> */
 void show_regs(struct pt_regs *regs)
diff --git a/trunk/arch/x86/um/sysrq_64.c b/trunk/arch/x86/um/sysrq_64.c
index 08258f179969..a0e7fb1134a0 100644
--- a/trunk/arch/x86/um/sysrq_64.c
+++ b/trunk/arch/x86/um/sysrq_64.c
@@ -10,7 +10,7 @@
 #include <linux/utsname.h>
 #include <asm/current.h>
 #include <asm/ptrace.h>
-#include "sysrq.h"
+#include <asm/sysrq.h>
 
 void __show_regs(struct pt_regs *regs)
 {