hci_usb: do not initialize static variables to 0

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

diff --git a/include/asm-x86/siginfo.h b/include/asm-x86/siginfo.h
index 0b8e4bb..a477bea 100644 (file)
--- a/include/asm-x86/siginfo.h
+++ b/include/asm-x86/siginfo.h
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "siginfo_32.h"
-# else
-#  include "siginfo_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "siginfo_32.h"
-# else
-#  include "siginfo_64.h"
-# endif
+#ifndef _ASM_X86_SIGINFO_H
+#define _ASM_X86_SIGINFO_H
+
+#ifdef __x86_64__
+# define __ARCH_SI_PREAMBLE_SIZE       (4 * sizeof(int))
+#endif
+
+#include <asm-generic/siginfo.h>
+
 #endif