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