diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/m68k/include/asm/io_no.h | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/include/asm/io_no.h')
| -rw-r--r-- | arch/m68k/include/asm/io_no.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 6adef1ee2082..7f57436ec18f 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h | |||
| @@ -134,7 +134,7 @@ static inline void io_insl(unsigned int addr, void *buf, int len) | |||
| 134 | #define insw(a,b,l) io_insw(a,b,l) | 134 | #define insw(a,b,l) io_insw(a,b,l) |
| 135 | #define insl(a,b,l) io_insl(a,b,l) | 135 | #define insl(a,b,l) io_insl(a,b,l) |
| 136 | 136 | ||
| 137 | #define IO_SPACE_LIMIT 0xffff | 137 | #define IO_SPACE_LIMIT 0xffffffff |
| 138 | 138 | ||
| 139 | 139 | ||
| 140 | /* Values for nocacheflag and cmode */ | 140 | /* Values for nocacheflag and cmode */ |