diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 03:21:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 04:18:14 -0800 |
| commit | f11fa82708df824612929d3290ce29d8b3c368fc (patch) | |
| tree | 95c697879c0b64f7299e595936e85ab6ca7c4764 /include | |
| parent | 4b9b77916fc11f03321079063a6fe2b3733559bb (diff) | |
| download | linux-f11fa82708df824612929d3290ce29d8b3c368fc.tar.bz2 | |
[SPARC]: Merge asm-sparc{,64}/emergency-restart.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/emergency-restart.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h index 108d8c48e42e..2cac7b644da8 100644 --- a/include/asm-sparc64/emergency-restart.h +++ b/include/asm-sparc64/emergency-restart.h @@ -1,6 +1 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include <asm-generic/emergency-restart.h> - -#endif /* _ASM_EMERGENCY_RESTART_H */ +#include <asm-sparc/emergency-restart.h> |