aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
commitf5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch)
tree7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/sparc
parent9853832c49dc1685587abeb4e1decd4be690d256 (diff)
parent1560a79a2c2ea0c3826150da8029991d685de990 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/Kconfig5
-rw-r--r--arch/sparc/kernel/ioport.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 51008a2ba5b4..99f8971716d2 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -48,9 +48,8 @@ config SMP
48 Y to "Enhanced Real Time Clock Support", below. The "Advanced Power 48 Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
49 Management" code will be disabled if you say Y here. 49 Management" code will be disabled if you say Y here.
50 50
51 See also the <file:Documentation/smp.txt>, 51 See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
52 <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at 52 available at <http://www.tldp.org/docs.html#howto>.
53 <http://www.tldp.org/docs.html#howto>.
54 53
55 If you don't know what to do here, say N. 54 If you don't know what to do here, say N.
56 55
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 97aa50d1e4ae..ad0ede24ca1d 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -305,7 +305,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
305 struct resource *res; 305 struct resource *res;
306 int order; 306 int order;
307 307
308 /* XXX why are some lenghts signed, others unsigned? */ 308 /* XXX why are some lengths signed, others unsigned? */
309 if (len <= 0) { 309 if (len <= 0) {
310 return NULL; 310 return NULL;
311 } 311 }
@@ -393,7 +393,7 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba)
393 */ 393 */
394dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction) 394dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int direction)
395{ 395{
396 /* XXX why are some lenghts signed, others unsigned? */ 396 /* XXX why are some lengths signed, others unsigned? */
397 if (len <= 0) { 397 if (len <= 0) {
398 return 0; 398 return 0;
399 } 399 }