summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/include/asm/user.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-11 10:49:34 +0100
commitd95c3578120e5bc4784069439f00ccb1b5f87717 (patch)
treec819de31de3983f3d69f223ede07667ff23bf7da /arch/m68knommu/include/asm/user.h
parentba1d755a36f66101aa88ac9ebb54694def6ec38d (diff)
parent78b020d035074fc3aa4d017353bb2c32e2aff56f (diff)
downloadtalos-obmc-linux-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.gz
talos-obmc-linux-d95c3578120e5bc4784069439f00ccb1b5f87717.zip
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'arch/m68knommu/include/asm/user.h')
-rw-r--r--arch/m68knommu/include/asm/user.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/include/asm/user.h b/arch/m68knommu/include/asm/user.h
deleted file mode 100644
index a5a555b761c4..000000000000
--- a/arch/m68knommu/include/asm/user.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/user.h>
OpenPOWER on IntegriCloud