From 192fcec6a81533246919dced849e1b379009dbfc Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 Jan 2012 16:31:53 -0500
Subject: [PATCH] --- yaml --- r: 296430 b: refs/heads/master c:
 69a3b4b28e29142f55de4d0661c3426ba9f1b6d3 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/um/include/asm/ptrace-generic.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 010316dc8442..5e8017f45b0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2220b2a124d2fe7b0074b23680177c8e905a76c
+refs/heads/master: 69a3b4b28e29142f55de4d0661c3426ba9f1b6d3
diff --git a/trunk/arch/um/include/asm/ptrace-generic.h b/trunk/arch/um/include/asm/ptrace-generic.h
index f605d3c4844c..e786a6a3ec5e 100644
--- a/trunk/arch/um/include/asm/ptrace-generic.h
+++ b/trunk/arch/um/include/asm/ptrace-generic.h
@@ -9,7 +9,6 @@
 #ifndef __ASSEMBLY__
 
 #include <asm/ptrace-abi.h>
-#include <asm/user.h>
 #include "sysdep/ptrace.h"
 
 struct pt_regs {