Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / cris / include / asm / signal.h

diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h
index b3c5ef05011fc7e49fcc1693940bdae671510a6d..c0cb1fd4644c46a35c53d23bb0252e24d407fce8 100644 (file)
--- a/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@ -35,9 +35,4 @@ struct k_sigaction {
 };
 #include <asm/sigcontext.h>
 
-/* here we could define asm-optimized sigaddset, sigdelset etc. operations. 
- * if we don't, generic ones are used from linux/signal.h
- */
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
 #endif