summaryrefslogtreecommitdiff
path: root/include/asm-arm/resource.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-22 15:08:57 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-22 15:08:57 +0400
commit0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch)
tree81dcf756db373444140bb2623584710c628e3048 /include/asm-arm/resource.h
parentfbdbf709938d155c719c76b9894d28342632c797 (diff)
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
downloadlinux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.xz
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'include/asm-arm/resource.h')
-rw-r--r--include/asm-arm/resource.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-arm/resource.h b/include/asm-arm/resource.h
deleted file mode 100644
index 734b581b5b6a..000000000000
--- a/include/asm-arm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ARM_RESOURCE_H
-#define _ARM_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif