projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6]
/
include
/
asm-arm26
/
signal.h
diff --git
a/include/asm-arm26/signal.h
b/include/asm-arm26/signal.h
index
dedb292
..
37ad253
100644
(file)
--- a/
include/asm-arm26/signal.h
+++ b/
include/asm-arm26/signal.h
@@
-166,9
+166,6
@@
typedef struct sigaltstack {
#include <asm/sigcontext.h>
#define sigmask(sig) (1UL << ((sig) - 1))
-//FIXME!!!
-//#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER
-
#endif