diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
tree | 8fb40782e79472ed882ff2098d4dd295557278ee /include/asm-blackfin/mem_map.h | |
parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-blackfin/mem_map.h')
-rw-r--r-- | include/asm-blackfin/mem_map.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-blackfin/mem_map.h b/include/asm-blackfin/mem_map.h deleted file mode 100644 index 42d1f37f6d9..00000000000 --- a/include/asm-blackfin/mem_map.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * mem_map.h - * Common header file for blackfin family of processors. - * - */ - -#ifndef _MEM_MAP_H_ -#define _MEM_MAP_H_ - -#include <asm/mach/mem_map.h> - -#endif /* _MEM_MAP_H_ */ |