Merge branch 'x86/boot'

[karo-tx-linux.git] / include / linux / signal.h

diff --git a/include/linux/signal.h b/include/linux/signal.h
index 26b424adc84299b6a53c9ad986e4d9350d16b68a..e19a011b43b7632163894ca70dde03ebaac64203 100644 (file)
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -1,11 +1,8 @@
 #ifndef _LINUX_SIGNAL_H
 #define _LINUX_SIGNAL_H
 
-#include <asm/signal.h>
-#include <asm/siginfo.h>
-
-#ifdef __KERNEL__
 #include <linux/list.h>
+#include <uapi/linux/signal.h>
 
 struct task_struct;
 
@@ -388,6 +385,4 @@ int unhandled_signal(struct task_struct *tsk, int sig);
 
 void signals_init(void);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SIGNAL_H */