summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/exec_kern.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-05-30 21:34:37 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-05-30 21:34:37 +0100
commit4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch)
tree35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /arch/um/kernel/exec_kern.c
parent442d207eb0b4e7047c4fedccd900c425e689d502 (diff)
parent5e485b7975472ba4a408523deb6541e70c451842 (diff)
downloadtalos-obmc-linux-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.tar.gz
talos-obmc-linux-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.zip
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/um/kernel/exec_kern.c')
-rw-r--r--arch/um/kernel/exec_kern.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
index 49ddabe69be7..efd222ffe20e 100644
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
@@ -16,7 +16,6 @@
#include "kern.h"
#include "irq_user.h"
#include "tlb.h"
-#include "2_5compat.h"
#include "os.h"
#include "time_user.h"
#include "choose-mode.h"
OpenPOWER on IntegriCloud