diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
| commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
| tree | 1f967f283dade6e03897169bb29513354f49f910 /arch/mn10300 | |
| parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
| parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/include/asm/cacheflush.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h index 2db746a251f8..1a55d61f0d06 100644 --- a/arch/mn10300/include/asm/cacheflush.h +++ b/arch/mn10300/include/asm/cacheflush.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | 18 | ||
| 19 | /* | 19 | /* |
| 20 | * virtually-indexed cache managment (our cache is physically indexed) | 20 | * virtually-indexed cache management (our cache is physically indexed) |
| 21 | */ | 21 | */ |
| 22 | #define flush_cache_all() do {} while (0) | 22 | #define flush_cache_all() do {} while (0) |
| 23 | #define flush_cache_mm(mm) do {} while (0) | 23 | #define flush_cache_mm(mm) do {} while (0) |
| @@ -31,7 +31,7 @@ | |||
| 31 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) | 31 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) |
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * physically-indexed cache managment | 34 | * physically-indexed cache management |
| 35 | */ | 35 | */ |
| 36 | #ifndef CONFIG_MN10300_CACHE_DISABLED | 36 | #ifndef CONFIG_MN10300_CACHE_DISABLED |
| 37 | 37 | ||