diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-21 08:47:10 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-21 08:47:10 -0700 |
| commit | 525ae82073bf9723386c4aaffcd35e49812c2e05 (patch) | |
| tree | daed70969bd8c7cd287296bc72085d04f0ee8068 /include/asm-mips | |
| parent | 49824db2751e56f8e79ad47ccc91a83f5bc4539b (diff) | |
| parent | 1c20618e2767bdcbe27e331a118a6f0e58eb64d2 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/processor.h | 6 | ||||
| -rw-r--r-- | include/asm-mips/signal.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index c08e0bf6e76c..33e8cc7c721d 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h @@ -135,12 +135,6 @@ extern unsigned int vced_count, vcei_count; /* * Bus types (default is ISA, but people can check others with these..) */ -#ifdef CONFIG_EISA -extern int EISA_bus; -#else -#define EISA_bus (0) -#endif - #define MCA_bus 0 #define MCA_bus__is_a_macro /* for versions in ksyms.c */ diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h index 40d73cc2a1e0..994987db61be 100644 --- a/include/asm-mips/signal.h +++ b/include/asm-mips/signal.h @@ -59,7 +59,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ /* These should not be considered constants from userland. */ #define SIGRTMIN 32 -#define SIGRTMAX (_NSIG-1) +#define SIGRTMAX _NSIG /* * SA_FLAGS values: |