diff options
author | Paul Mackerras <paulus@samba.org> | 2009-04-22 05:02:09 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2009-04-22 05:02:09 +0200 |
commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /arch/frv/include/asm/resource.h | |
parent | powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover (diff) | |
parent | powerpc: Fix of_node_put() exit path in of_irq_map_one() (diff) | |
download | linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.xz linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.zip |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'arch/frv/include/asm/resource.h')
-rw-r--r-- | arch/frv/include/asm/resource.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/frv/include/asm/resource.h b/arch/frv/include/asm/resource.h new file mode 100644 index 000000000000..5fc60548fd02 --- /dev/null +++ b/arch/frv/include/asm/resource.h @@ -0,0 +1,7 @@ +#ifndef _ASM_RESOURCE_H +#define _ASM_RESOURCE_H + +#include <asm-generic/resource.h> + +#endif /* _ASM_RESOURCE_H */ + |