diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-09-01 08:50:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-09-01 08:50:25 -0700 |
| commit | b022adc60f0db53732ab8761c4e41d2693a2d629 (patch) | |
| tree | 6a10a4ed15040983719fda2e666b79add1f5a614 /include/linux | |
| parent | e3009633446bc082ace4c9384241267cc0b43a0f (diff) | |
| parent | a0adf3b176081c8af8176cc08dce984b0f0894de (diff) | |
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kobject.h | 2 | ||||
| -rw-r--r-- | include/linux/kref.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index f3f20feee67b..331d25b9cc41 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -15,7 +15,7 @@ #ifndef _KOBJECT_H_ #define _KOBJECT_H_ -#if __KERNEL__ +#ifdef __KERNEL__ #include <linux/types.h> #include <linux/list.h> diff --git a/include/linux/kref.h b/include/linux/kref.h index a8a8b05ca3d0..ea5948785ebf 100644 --- a/include/linux/kref.h +++ b/include/linux/kref.h @@ -15,7 +15,7 @@ #ifndef _KREF_H_ #define _KREF_H_ -#if __KERNEL__ +#ifdef __KERNEL__ #include <linux/types.h> #include <asm/atomic.h> |