diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
commit | 88bef5a4074e0568cf54df410f41065c06694d8a (patch) | |
tree | bc4d59f57ce315bcb16dad5491ab9983ab122d8a /include/asm-v850/topology.h | |
parent | 054a3fd824705543322d787893de9f3755151517 (diff) | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/asm-v850/topology.h')
-rw-r--r-- | include/asm-v850/topology.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-v850/topology.h b/include/asm-v850/topology.h deleted file mode 100644 index 6040e41d794..00000000000 --- a/include/asm-v850/topology.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __V850_TOPOLOGY_H__ -#define __V850_TOPOLOGY_H__ - -#include <asm-generic/topology.h> - -#endif /* __V850_TOPOLOGY_H__ */ |