diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-arm/system.h | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-arm/system.h')
-rw-r--r-- | include/asm-arm/system.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 1d7e28b0b..91c08d668 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -1,6 +1,8 @@ #ifndef __ASM_ARM_SYSTEM_H #define __ASM_ARM_SYSTEM_H +#include <linux/config.h> + /* The type of machine we're running on */ extern unsigned int machine_type; #define MACH_TYPE_EBSA110 0 @@ -11,6 +13,29 @@ extern unsigned int machine_type; #define MACH_TYPE_CATS 6 #define MACH_TYPE_TBOX 7 +#ifdef CONFIG_ARCH_EBSA285 +#define machine_is_ebsa285() (1) +#else +#define machine_is_ebsa285() (0) +#endif + +#ifdef CONFIG_ARCH_VNC +#define machine_is_netwinder() (1) +#else +#define machine_is_netwinder() (0) +#endif + +#if defined(CONFIG_CATS) +#define machine_is_cats() (machine_type == MACH_TYPE_CATS) +#else +#define machine_is_cats() (0) +#endif + +#if 0 +#define machine_is_ebsa285() (machine_type == MACH_TYPE_EBSA285) +#define machine_is_netwinder() (machine_type == MACH_TYPE_NETWINDER) +#endif + #include <linux/kernel.h> #include <asm/proc-fns.h> |