aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/resource.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
commitfbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch)
treefeb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/include/asm/resource.h
parenta3d732f93785da17e0137210deadb4616f5536fc (diff)
parentee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff)
downloadkernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.zip
kernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.gz
kernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.bz2
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/include/asm/resource.h')
-rw-r--r--arch/cris/include/asm/resource.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/cris/include/asm/resource.h b/arch/cris/include/asm/resource.h
new file mode 100644
index 0000000..b5d2944
--- /dev/null
+++ b/arch/cris/include/asm/resource.h
@@ -0,0 +1,6 @@
+#ifndef _CRIS_RESOURCE_H
+#define _CRIS_RESOURCE_H
+
+#include <asm-generic/resource.h>
+
+#endif