diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-sa1100/jornada720_ssp.c | 4 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/slb.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/head.S | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 28cf36967977..506a5e5a9ad5 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
@@ -54,7 +54,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse); | |||
54 | * timeout after <timeout> rounds. Needs mcu running before its called. | 54 | * timeout after <timeout> rounds. Needs mcu running before its called. |
55 | * | 55 | * |
56 | * returns : %mcu output on success | 56 | * returns : %mcu output on success |
57 | * : %-ETIMEOUT on timeout | 57 | * : %-ETIMEDOUT on timeout |
58 | */ | 58 | */ |
59 | int jornada_ssp_byte(u8 byte) | 59 | int jornada_ssp_byte(u8 byte) |
60 | { | 60 | { |
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(jornada_ssp_byte); | |||
82 | * jornada_ssp_inout - decide if input is command or trading byte | 82 | * jornada_ssp_inout - decide if input is command or trading byte |
83 | * | 83 | * |
84 | * returns : (jornada_ssp_byte(byte)) on success | 84 | * returns : (jornada_ssp_byte(byte)) on success |
85 | * : %-ETIMEOUT on timeout failure | 85 | * : %-ETIMEDOUT on timeout failure |
86 | */ | 86 | */ |
87 | int jornada_ssp_inout(u8 byte) | 87 | int jornada_ssp_inout(u8 byte) |
88 | { | 88 | { |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index c56fd3eb7c10..a60cfe757914 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -885,7 +885,7 @@ config BFIN_GPTIMERS | |||
885 | are unsure, say N. | 885 | are unsure, say N. |
886 | 886 | ||
887 | To compile this driver as a module, choose M here: the module | 887 | To compile this driver as a module, choose M here: the module |
888 | will be called gptimers.ko. | 888 | will be called gptimers. |
889 | 889 | ||
890 | choice | 890 | choice |
891 | prompt "Uncached DMA region" | 891 | prompt "Uncached DMA region" |
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 89497fb04280..3b52c80e5e33 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * PowerPC64 SLB support. | 2 | * PowerPC64 SLB support. |
3 | * | 3 | * |
4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM | 4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM |
5 | * Based on earlier code writteh by: | 5 | * Based on earlier code written by: |
6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com | 6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com |
7 | * Copyright (c) 2001 Dave Engebretsen | 7 | * Copyright (c) 2001 Dave Engebretsen |
8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM | 8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM |
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 6d227413cbe7..ec6882348520 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
@@ -62,7 +62,7 @@ __HEAD | |||
62 | .org 0x100 | 62 | .org 0x100 |
63 | # | 63 | # |
64 | # subroutine for loading from tape | 64 | # subroutine for loading from tape |
65 | # Paramters: | 65 | # Parameters: |
66 | # R1 = device number | 66 | # R1 = device number |
67 | # R2 = load address | 67 | # R2 = load address |
68 | .Lloader: | 68 | .Lloader: |