diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-04 06:55:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-04 06:55:58 -0800 |
| commit | 679ab9a6cbc2adc28092db33d6c76b0233ab7908 (patch) | |
| tree | 094a4d5ba984c5a47dd195e615936b104c4c3475 /include | |
| parent | 56340866352d25d75880c673b02fd2aea7545393 (diff) | |
| parent | b2213433c207f880ed43aff1516d77ddff7a9299 (diff) | |
Merge bk://ppc.bkbits.net/for-linus-ppc
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/hardirq.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index c96e72a0235e..f83d013093f7 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -4,6 +4,7 @@ #include <linux/config.h> #include <linux/cache.h> +#include <linux/smp_lock.h> /* The __last_jiffy_stamp field is needed to ensure that no decrementer * interrupt is lost on SMP machines. Since on most CPUs it is in the same diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index cd7e330c1eb1..306a4a7a4dae 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -635,9 +635,7 @@ extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); * Bus types */ #define EISA_bus 0 -#define EISA_bus__is_a_macro /* for versions in ksyms.c */ #define MCA_bus 0 -#define MCA_bus__is_a_macro /* for versions in ksyms.c */ /* Lazy FPU handling on uni-processor */ extern struct task_struct *last_task_used_math; |