diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-12 09:01:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-12 09:01:03 -0700 |
| commit | 8cf04c0a7e6175522cdfea21805afdf88d3fc5f9 (patch) | |
| tree | 87a50ad72b4a2eb3b21226c11a1edaaef221aa98 /include | |
| parent | 35d60f7f047627fbd19df0241878ea38192b75ab (diff) | |
| parent | 9e589513f577b3138a10b84686d429620134058e (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/smp_lock.h | 2 | ||||
| -rw-r--r-- | include/linux/tpqic02.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index 5a0b83a677d9..80fbd56eb3e4 100644 --- a/include/linux/smp_lock.h +++ b/include/linux/smp_lock.h @@ -5,7 +5,7 @@ #include <linux/sched.h> #include <linux/spinlock.h> -#if CONFIG_SMP || CONFIG_PREEMPT +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) extern spinlock_t kernel_flag; diff --git a/include/linux/tpqic02.h b/include/linux/tpqic02.h index 2972cb2f827c..f980d4ff01fe 100644 --- a/include/linux/tpqic02.h +++ b/include/linux/tpqic02.h @@ -12,7 +12,7 @@ #include <linux/config.h> -#if CONFIG_QIC02_TAPE || CONFIG_QIC02_TAPE_MODULE +#if defined(CONFIG_QIC02_TAPE) || defined(CONFIG_QIC02_TAPE_MODULE) /* need to have QIC02_TAPE_DRIVE and QIC02_TAPE_IFC expand to something */ #include <linux/mtio.h> |