diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/sh | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/mach-common/mach/titan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/mach-common/mach/titan.h b/arch/sh/include/mach-common/mach/titan.h index 03f3583c8918..4a674d27cbb8 100644 --- a/arch/sh/include/mach-common/mach/titan.h +++ b/arch/sh/include/mach-common/mach/titan.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Platform defintions for Titan | 2 | * Platform definitions for Titan |
| 3 | */ | 3 | */ |
| 4 | #ifndef _ASM_SH_TITAN_H | 4 | #ifndef _ASM_SH_TITAN_H |
| 5 | #define _ASM_SH_TITAN_H | 5 | #define _ASM_SH_TITAN_H |