diff options
Diffstat (limited to 'include/asm-frv')
-rw-r--r-- | include/asm-frv/system.h | 5 | ||||
-rw-r--r-- | include/asm-frv/topology.h | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index 30a67a9da11..cb307f8a6b4 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h @@ -197,11 +197,6 @@ do { \ do { var = (value); barrier(); } while (0) #endif -#define HARD_RESET_NOW() \ -do { \ - cli(); \ -} while(1) - extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2))); extern void free_initmem(void); diff --git a/include/asm-frv/topology.h b/include/asm-frv/topology.h index abe7298742a..94272435270 100644 --- a/include/asm-frv/topology.h +++ b/include/asm-frv/topology.h @@ -5,10 +5,8 @@ #error NUMA not supported yet -#else /* !CONFIG_NUMA */ +#endif /* CONFIG_NUMA */ #include <asm-generic/topology.h> -#endif /* CONFIG_NUMA */ - #endif /* _ASM_TOPOLOGY_H */ |