diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/include/asm/cyclone.h | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
| download | linux-2b12a4c524812fb3f6ee590a02e65b95c8c32229.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/cyclone.h')
| -rw-r--r-- | arch/ia64/include/asm/cyclone.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/cyclone.h b/arch/ia64/include/asm/cyclone.h new file mode 100644 index 000000000000..88f6500e84ab --- /dev/null +++ b/arch/ia64/include/asm/cyclone.h @@ -0,0 +1,15 @@ +#ifndef ASM_IA64_CYCLONE_H +#define ASM_IA64_CYCLONE_H + +#ifdef CONFIG_IA64_CYCLONE +extern int use_cyclone; +extern void __init cyclone_setup(void); +#else /* CONFIG_IA64_CYCLONE */ +#define use_cyclone 0 +static inline void cyclone_setup(void) +{ + printk(KERN_ERR "Cyclone Counter: System not configured" + " w/ CONFIG_IA64_CYCLONE.\n"); +} +#endif /* CONFIG_IA64_CYCLONE */ +#endif /* !ASM_IA64_CYCLONE_H */ |