diff options
author | David Howells <dhowells@redhat.com> | 2012-10-16 20:28:01 (GMT) |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-16 20:28:01 (GMT) |
commit | e1141355e00a9992fba1c3b3712224c5e58f4118 (patch) | |
tree | 048e7b6af6c30d82e8fab20dd864b4718ddcf22b /arch/parisc/include/asm/topology.h | |
parent | dd8e8c4a2c902d8350b702e7bc7c2799e5e7e331 (diff) | |
parent | 7d55a5dd61f794df89a733b1b8223cdbffe8897c (diff) | |
download | linux-e1141355e00a9992fba1c3b3712224c5e58f4118.tar.xz |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git/
Diffstat (limited to 'arch/parisc/include/asm/topology.h')
-rw-r--r-- | arch/parisc/include/asm/topology.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/parisc/include/asm/topology.h b/arch/parisc/include/asm/topology.h deleted file mode 100644 index d8133eb..0000000 --- a/arch/parisc/include/asm/topology.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_PARISC_TOPOLOGY_H -#define _ASM_PARISC_TOPOLOGY_H - -#include <asm-generic/topology.h> - -#endif /* _ASM_PARISC_TOPOLOGY_H */ |