diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 13:02:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 13:02:35 +0200 |
| commit | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c (patch) | |
| tree | e9684c84f53272319a5acd4b9c86503f30274a51 /arch/blackfin/include/asm/resource.h | |
| parent | 11c231a962c740b3216eb6565149ae5a7944cba7 (diff) | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
| download | linux-next-42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c.tar.gz | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/include/asm/resource.h')
| -rw-r--r-- | arch/blackfin/include/asm/resource.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/resource.h b/arch/blackfin/include/asm/resource.h new file mode 100644 index 000000000000..091355ab3495 --- /dev/null +++ b/arch/blackfin/include/asm/resource.h @@ -0,0 +1,6 @@ +#ifndef _BFIN_RESOURCE_H +#define _BFIN_RESOURCE_H + +#include <asm-generic/resource.h> + +#endif /* _BFIN_RESOURCE_H */ |