Merge branch 'linus' into x86/urgent
[linux-2.6] / include / asm-cris / resource.h
1 #ifndef _CRIS_RESOURCE_H
2 #define _CRIS_RESOURCE_H
3
4 #include <asm-generic/resource.h>
5
6 #endif