diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /include/asm-sparc/asi.h | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'include/asm-sparc/asi.h')
| -rw-r--r-- | include/asm-sparc/asi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/asi.h b/include/asm-sparc/asi.h index 58c3754da926..158f9b00d43f 100644 --- a/include/asm-sparc/asi.h +++ b/include/asm-sparc/asi.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: asi.h,v 1.18 1998/03/09 14:04:46 jj Exp $ */ | ||
| 2 | #ifndef _SPARC_ASI_H | 1 | #ifndef _SPARC_ASI_H |
| 3 | #define _SPARC_ASI_H | 2 | #define _SPARC_ASI_H |
| 4 | 3 | ||