Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-s390 / topology.h
1 #ifndef _ASM_S390_TOPOLOGY_H
2 #define _ASM_S390_TOPOLOGY_H
3
4 #include <asm-generic/topology.h>
5
6 #endif /* _ASM_S390_TOPOLOGY_H */