diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 19:03:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 19:03:44 +0100 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/pSeries_reconfig.h | |
| parent | [PATCH] Update cyblafb driver (diff) | |
| parent | powerpc: unbreak iSeries compilation again (diff) | |
| download | linux-6150c32589d1976ca8a5c987df951088c05a7542.tar.xz linux-6150c32589d1976ca8a5c987df951088c05a7542.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/pSeries_reconfig.h')
| -rw-r--r-- | include/asm-powerpc/pSeries_reconfig.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/pSeries_reconfig.h b/include/asm-powerpc/pSeries_reconfig.h index c0db1ea7f7d1..ea6cfb8efb84 100644 --- a/include/asm-powerpc/pSeries_reconfig.h +++ b/include/asm-powerpc/pSeries_reconfig.h @@ -1,5 +1,6 @@ #ifndef _PPC64_PSERIES_RECONFIG_H #define _PPC64_PSERIES_RECONFIG_H +#ifdef __KERNEL__ #include <linux/notifier.h> @@ -22,4 +23,5 @@ static inline int pSeries_reconfig_notifier_register(struct notifier_block *nb) static inline void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) { } #endif /* CONFIG_PPC_PSERIES */ +#endif /* __KERNEL__ */ #endif /* _PPC64_PSERIES_RECONFIG_H */ |