diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/um/include/asm/topology.h | |
parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/um/include/asm/topology.h')
-rw-r--r-- | arch/um/include/asm/topology.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/um/include/asm/topology.h b/arch/um/include/asm/topology.h deleted file mode 100644 index 0905e4f21d42..000000000000 --- a/arch/um/include/asm/topology.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_UM_TOPOLOGY_H -#define _ASM_UM_TOPOLOGY_H - -#include <asm-generic/topology.h> - -#endif |