summaryrefslogtreecommitdiff
path: root/include/asm-um/boot.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 11:38:02 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-10-27 11:38:02 (GMT)
commit5292ae11babca23c3ff82593630d2d7eebc350a9 (patch)
tree30a6c8123b35686098f306ea39398b7621f42054 /include/asm-um/boot.h
parentb0f209898f1a177bd503d49215b8c6628797a81c (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
downloadlinux-fsl-qoriq-5292ae11babca23c3ff82593630d2d7eebc350a9.tar.xz
Merge commit 'v2.6.28-rc2' into x86/uv
Diffstat (limited to 'include/asm-um/boot.h')
-rw-r--r--include/asm-um/boot.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/boot.h b/include/asm-um/boot.h
deleted file mode 100644
index 09548c3..0000000
--- a/include/asm-um/boot.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_BOOT_H
-#define __UM_BOOT_H
-
-#include "asm/arch/boot.h"
-
-#endif