diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /include/asm-mips/mach-generic/cpu-feature-overrides.h | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/mach-generic/cpu-feature-overrides.h')
| -rw-r--r-- | include/asm-mips/mach-generic/cpu-feature-overrides.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-generic/cpu-feature-overrides.h b/include/asm-mips/mach-generic/cpu-feature-overrides.h index 0aecfd08e39a..7c185bb06f13 100644 --- a/include/asm-mips/mach-generic/cpu-feature-overrides.h +++ b/include/asm-mips/mach-generic/cpu-feature-overrides.h | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | #ifndef __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H | 8 | #ifndef __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H |
| 9 | #define __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H | 9 | #define __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H |
| 10 | 10 | ||
| 11 | /* Intensionally empty file ... */ | 11 | /* Intentionally empty file ... */ |
| 12 | 12 | ||
| 13 | #endif /* __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H */ | 13 | #endif /* __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H */ |