Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

[linux-2.6] / include / asm-frv / siginfo.h

#ifndef _ASM_SIGINFO_H
#define _ASM_SIGINFO_H

#include <linux/types.h>
#include <asm-generic/siginfo.h>

#define FPE_MDAOVF      (__SI_FAULT|9)  /* media overflow */
#undef NSIGFPE
#define NSIGFPE         9

#endif