diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /include/asm-sparc/psr.h | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'include/asm-sparc/psr.h')
| -rw-r--r-- | include/asm-sparc/psr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/psr.h b/include/asm-sparc/psr.h index 213970477a24..b8c0e5f0a66b 100644 --- a/include/asm-sparc/psr.h +++ b/include/asm-sparc/psr.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: psr.h,v 1.15 1997/10/04 08:54:22 ecd Exp $ | 1 | /* |
| 2 | * psr.h: This file holds the macros for masking off various parts of | 2 | * psr.h: This file holds the macros for masking off various parts of |
| 3 | * the processor status register on the Sparc. This is valid | 3 | * the processor status register on the Sparc. This is valid |
| 4 | * for Version 8. On the V9 this is renamed to the PSTATE | 4 | * for Version 8. On the V9 this is renamed to the PSTATE |