diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /include/asm-sh/processor_64.h | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/asm-sh/processor_64.h')
| -rw-r--r-- | include/asm-sh/processor_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh/processor_64.h b/include/asm-sh/processor_64.h index eda4bef448e9..88a2edf8fa5d 100644 --- a/include/asm-sh/processor_64.h +++ b/include/asm-sh/processor_64.h | |||
| @@ -112,6 +112,7 @@ extern struct sh_cpuinfo cpu_data[]; | |||
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #define SR_IMASK 0x000000f0 | 114 | #define SR_IMASK 0x000000f0 |
| 115 | #define SR_FD 0x00008000 | ||
| 115 | #define SR_SSTEP 0x08000000 | 116 | #define SR_SSTEP 0x08000000 |
| 116 | 117 | ||
| 117 | #ifndef __ASSEMBLY__ | 118 | #ifndef __ASSEMBLY__ |