---

yaml --- r: 332958 b: refs/heads/master c: 382d95f h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · e774d03 · e774d03
1 parent 1d5976c
commit e774d03
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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 → trunk/arch/um/include/asm/sysrq.h b/trunk/arch/um/include/shared/sysrq.h → trunk/arch/um/include/asm/sysrq.h
diff --git 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
@@ -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
@@ -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)
 {