diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/m68k/include/asm/atariints.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/m68k/include/asm/atariints.h')
| -rw-r--r-- | arch/m68k/include/asm/atariints.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h index f597892e43a0..656bbbf5a6ff 100644 --- a/arch/m68k/include/asm/atariints.h +++ b/arch/m68k/include/asm/atariints.h | |||
| @@ -146,7 +146,7 @@ static inline void clear_mfp_bit( unsigned irq, int type ) | |||
| 146 | 146 | ||
| 147 | /* | 147 | /* |
| 148 | * {en,dis}able_irq have the usual semantics of temporary blocking the | 148 | * {en,dis}able_irq have the usual semantics of temporary blocking the |
| 149 | * interrupt, but not loosing requests that happen between disabling and | 149 | * interrupt, but not losing requests that happen between disabling and |
| 150 | * enabling. This is done with the MFP mask registers. | 150 | * enabling. This is done with the MFP mask registers. |
| 151 | */ | 151 | */ |
| 152 | 152 | ||