diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /include/asm-blackfin/mem_map.h | |
parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | op-kernel-dev-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip op-kernel-dev-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz |
Merge commit 'v2.6.27-rc6' into timers/hpet
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 42d1f37..0000000 --- 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_ */ |