summaryrefslogtreecommitdiffstats
path: root/include/asm-um/resource.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/asm-um/resource.h
parentftrace: warning in kernel/trace/ftrace.c (diff)
parentLinux 2.6.28-rc2 (diff)
downloadlinux-4944dd62de21230af039eda7cd218e9a09021d11.tar.xz
linux-4944dd62de21230af039eda7cd218e9a09021d11.zip
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/asm-um/resource.h')
-rw-r--r--include/asm-um/resource.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/resource.h b/include/asm-um/resource.h
deleted file mode 100644
index c9b074001252..000000000000
--- a/include/asm-um/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_RESOURCE_H
-#define __UM_RESOURCE_H
-
-#include "asm/arch/resource.h"
-
-#endif