diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /arch/powerpc/include/asm | |
parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
parent | bd1b2a555952d959f47169056fca05acf7eff81f (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: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/io.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/keylargo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 45698d55cd6a..a3855b81eada 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h | |||
@@ -394,7 +394,7 @@ __do_out_asm(_rec_outl, "stwbrx") | |||
394 | #endif /* CONFIG_PPC32 */ | 394 | #endif /* CONFIG_PPC32 */ |
395 | 395 | ||
396 | /* The "__do_*" operations below provide the actual "base" implementation | 396 | /* The "__do_*" operations below provide the actual "base" implementation |
397 | * for each of the defined acccessor. Some of them use the out_* functions | 397 | * for each of the defined accessors. Some of them use the out_* functions |
398 | * directly, some of them still use EEH, though we might change that in the | 398 | * directly, some of them still use EEH, though we might change that in the |
399 | * future. Those macros below provide the necessary argument swapping and | 399 | * future. Those macros below provide the necessary argument swapping and |
400 | * handling of the IO base for PIO. | 400 | * handling of the IO base for PIO. |
diff --git a/arch/powerpc/include/asm/keylargo.h b/arch/powerpc/include/asm/keylargo.h index d8520ef121f9..fc195d0b3c34 100644 --- a/arch/powerpc/include/asm/keylargo.h +++ b/arch/powerpc/include/asm/keylargo.h | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | #define KL_GPIO_SOUND_POWER (KEYLARGO_GPIO_0+0x05) | 52 | #define KL_GPIO_SOUND_POWER (KEYLARGO_GPIO_0+0x05) |
53 | 53 | ||
54 | /* Hrm... this one is only to be used on Pismo. It seeem to also | 54 | /* Hrm... this one is only to be used on Pismo. It seems to also |
55 | * control the timebase enable on other machines. Still to be | 55 | * control the timebase enable on other machines. Still to be |
56 | * experimented... --BenH. | 56 | * experimented... --BenH. |
57 | */ | 57 | */ |