diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/mips/Kconfig.debug | 2 | ||||
-rw-r--r-- | arch/mips/kernel/mips-mt.c | 2 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/gpio.c | 2 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/gpio_ebu.c | 2 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/gpio_stp.c | 2 | ||||
-rw-r--r-- | arch/mips/sni/pcimt.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 186fc8cf9ee0..f5e121213c22 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1002,12 +1002,12 @@ config HOLES_IN_ZONE | |||
1002 | bool | 1002 | bool |
1003 | 1003 | ||
1004 | # | 1004 | # |
1005 | # Endianess selection. Sufficiently obscure so many users don't know what to | 1005 | # Endianness selection. Sufficiently obscure so many users don't know what to |
1006 | # answer,so we try hard to limit the available choices. Also the use of a | 1006 | # answer,so we try hard to limit the available choices. Also the use of a |
1007 | # choice statement should be more obvious to the user. | 1007 | # choice statement should be more obvious to the user. |
1008 | # | 1008 | # |
1009 | choice | 1009 | choice |
1010 | prompt "Endianess selection" | 1010 | prompt "Endianness selection" |
1011 | help | 1011 | help |
1012 | Some MIPS machines can be configured for either little or big endian | 1012 | Some MIPS machines can be configured for either little or big endian |
1013 | byte order. These modes require different kernels and a different | 1013 | byte order. These modes require different kernels and a different |
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 83ed00a5644a..5a43aa0798ca 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
@@ -57,7 +57,7 @@ config CMDLINE | |||
57 | options. | 57 | options. |
58 | 58 | ||
59 | config CMDLINE_OVERRIDE | 59 | config CMDLINE_OVERRIDE |
60 | bool "Built-in command line overrides firware arguments" | 60 | bool "Built-in command line overrides firmware arguments" |
61 | default n | 61 | default n |
62 | depends on CMDLINE_BOOL | 62 | depends on CMDLINE_BOOL |
63 | help | 63 | help |
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index 7f3376b1c219..6ded9bd1489c 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c | |||
@@ -209,7 +209,7 @@ void mips_mt_set_cpuoptions(void) | |||
209 | unsigned int nconfig7 = oconfig7; | 209 | unsigned int nconfig7 = oconfig7; |
210 | 210 | ||
211 | if (mt_opt_norps) { | 211 | if (mt_opt_norps) { |
212 | printk("\"norps\" option deprectated: use \"rpsctl=\"\n"); | 212 | printk("\"norps\" option deprecated: use \"rpsctl=\"\n"); |
213 | } | 213 | } |
214 | if (mt_opt_rpsctl >= 0) { | 214 | if (mt_opt_rpsctl >= 0) { |
215 | printk("34K return prediction stack override set to %d.\n", | 215 | printk("34K return prediction stack override set to %d.\n", |
diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c index d2fa98f3c78d..c429a5bc080f 100644 --- a/arch/mips/lantiq/xway/gpio.c +++ b/arch/mips/lantiq/xway/gpio.c | |||
@@ -188,7 +188,7 @@ int __init ltq_gpio_init(void) | |||
188 | int ret = platform_driver_register(<q_gpio_driver); | 188 | int ret = platform_driver_register(<q_gpio_driver); |
189 | 189 | ||
190 | if (ret) | 190 | if (ret) |
191 | pr_info("ltq_gpio : Error registering platfom driver!"); | 191 | pr_info("ltq_gpio : Error registering platform driver!"); |
192 | return ret; | 192 | return ret; |
193 | } | 193 | } |
194 | 194 | ||
diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c index b91c7f17f10f..aae17170472f 100644 --- a/arch/mips/lantiq/xway/gpio_ebu.c +++ b/arch/mips/lantiq/xway/gpio_ebu.c | |||
@@ -119,7 +119,7 @@ static int __init ltq_ebu_init(void) | |||
119 | int ret = platform_driver_register(<q_ebu_driver); | 119 | int ret = platform_driver_register(<q_ebu_driver); |
120 | 120 | ||
121 | if (ret) | 121 | if (ret) |
122 | pr_info("ltq_ebu : Error registering platfom driver!"); | 122 | pr_info("ltq_ebu : Error registering platform driver!"); |
123 | return ret; | 123 | return ret; |
124 | } | 124 | } |
125 | 125 | ||
diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index ff9991cddeaa..fd07d87adaa9 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c | |||
@@ -150,7 +150,7 @@ int __init ltq_stp_init(void) | |||
150 | int ret = platform_driver_register(<q_stp_driver); | 150 | int ret = platform_driver_register(<q_stp_driver); |
151 | 151 | ||
152 | if (ret) | 152 | if (ret) |
153 | pr_info("ltq_stp: error registering platfom driver"); | 153 | pr_info("ltq_stp: error registering platform driver"); |
154 | return ret; | 154 | return ret; |
155 | } | 155 | } |
156 | 156 | ||
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index ed3b3d317358..cdb1417fba59 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -29,7 +29,7 @@ static void __init sni_pcimt_sc_init(void) | |||
29 | 29 | ||
30 | scsiz = cacheconf & 7; | 30 | scsiz = cacheconf & 7; |
31 | if (scsiz == 0) { | 31 | if (scsiz == 0) { |
32 | printk("Second level cache is deactived.\n"); | 32 | printk("Second level cache is deactivated.\n"); |
33 | return; | 33 | return; |
34 | } | 34 | } |
35 | if (scsiz >= 6) { | 35 | if (scsiz >= 6) { |