summaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/signal.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:20:30 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:21:47 -0700
commitd392da5207352f09030e95d9ea335a4225667ec0 (patch)
tree7d6cd1932afcad0a5619a5c504a6d93ca318187c /arch/m32r/include/asm/signal.h
parente39d5ef678045d61812c1401f04fe8edb14d6359 (diff)
parent387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff)
downloadtalos-op-linux-d392da5207352f09030e95d9ea335a4225667ec0.tar.gz
talos-op-linux-d392da5207352f09030e95d9ea335a4225667ec0.zip
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'arch/m32r/include/asm/signal.h')
-rw-r--r--arch/m32r/include/asm/signal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h
index 9c1acb2b1a92..b2eeb0de1c8d 100644
--- a/arch/m32r/include/asm/signal.h
+++ b/arch/m32r/include/asm/signal.h
@@ -157,7 +157,6 @@ typedef struct sigaltstack {
#undef __HAVE_ARCH_SIG_BITOPS
struct pt_regs;
-extern int do_signal(struct pt_regs *regs, sigset_t *oldset);
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
OpenPOWER on IntegriCloud