Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / signal.h

diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h
index 694c8d2dab8777d67094c0ef610a5bc4c3844160..a4d8f864854125e1f1bdd369738519d844f7538e 100644 (file)
--- a/include/asm-powerpc/signal.h
+++ b/include/asm-powerpc/signal.h
@@ -2,10 +2,13 @@
 #define _ASM_POWERPC_SIGNAL_H
 
 #include <linux/types.h>
-#include <linux/config.h>
 
 #define _NSIG          64
-#define _NSIG_BPW      BITS_PER_LONG
+#ifdef __powerpc64__
+#define _NSIG_BPW      64
+#else
+#define _NSIG_BPW      32
+#endif
 #define _NSIG_WORDS    (_NSIG / _NSIG_BPW)
 
 typedef unsigned long old_sigset_t;            /* at least 32 bits */