diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /arch/arm/mach-s3c24xx | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/bast-map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/dma.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/pm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/bast-map.h b/arch/arm/mach-s3c24xx/include/mach/bast-map.h index 6e7dc9d0cf0e..eecea2a50f8f 100644 --- a/arch/arm/mach-s3c24xx/include/mach/bast-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/bast-map.h | |||
@@ -74,7 +74,7 @@ | |||
74 | 74 | ||
75 | 75 | ||
76 | /* 0xE0000000 contains the IO space that is split by speed and | 76 | /* 0xE0000000 contains the IO space that is split by speed and |
77 | * wether the access is for 8 or 16bit IO... this ensures that | 77 | * whether the access is for 8 or 16bit IO... this ensures that |
78 | * the correct access is made | 78 | * the correct access is made |
79 | * | 79 | * |
80 | * 0x10000000 of space, partitioned as so: | 80 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h index ee99fd56c043..6b72d5a4b377 100644 --- a/arch/arm/mach-s3c24xx/include/mach/dma.h +++ b/arch/arm/mach-s3c24xx/include/mach/dma.h | |||
@@ -88,7 +88,7 @@ enum s3c2410_dma_state { | |||
88 | * | 88 | * |
89 | * This represents the state of the DMA engine, wrt to the loaded / running | 89 | * This represents the state of the DMA engine, wrt to the loaded / running |
90 | * transfers. Since we don't have any way of knowing exactly the state of | 90 | * transfers. Since we don't have any way of knowing exactly the state of |
91 | * the DMA transfers, we need to know the state to make decisions on wether | 91 | * the DMA transfers, we need to know the state to make decisions on whether |
92 | * we can | 92 | * we can |
93 | * | 93 | * |
94 | * S3C2410_DMA_NONE | 94 | * S3C2410_DMA_NONE |
diff --git a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h index 99612fcc4eb2..28376e56dd3b 100644 --- a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | |||
@@ -51,7 +51,7 @@ | |||
51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) | 51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) |
52 | 52 | ||
53 | /* 0xE0000000 contains the IO space that is split by speed and | 53 | /* 0xE0000000 contains the IO space that is split by speed and |
54 | * wether the access is for 8 or 16bit IO... this ensures that | 54 | * whether the access is for 8 or 16bit IO... this ensures that |
55 | * the correct access is made | 55 | * the correct access is made |
56 | * | 56 | * |
57 | * 0x10000000 of space, partitioned as so: | 57 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c index 60627e63a254..724755f0b0f5 100644 --- a/arch/arm/mach-s3c24xx/pm.c +++ b/arch/arm/mach-s3c24xx/pm.c | |||
@@ -121,7 +121,7 @@ void s3c_pm_configure_extint(void) | |||
121 | int pin; | 121 | int pin; |
122 | 122 | ||
123 | /* for each of the external interrupts (EINT0..EINT15) we | 123 | /* for each of the external interrupts (EINT0..EINT15) we |
124 | * need to check wether it is an external interrupt source, | 124 | * need to check whether it is an external interrupt source, |
125 | * and then configure it as an input if it is not | 125 | * and then configure it as an input if it is not |
126 | */ | 126 | */ |
127 | 127 | ||