diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/cavium-octeon/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/lantiq/falcon/sysctrl.c | 2 | ||||
| -rw-r--r-- | arch/mips/lantiq/xway/sysctrl.c | 2 | ||||
| -rw-r--r-- | arch/mips/pci/pci-lantiq.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig index 602866657938..c370426a7322 100644 --- a/arch/mips/cavium-octeon/Kconfig +++ b/arch/mips/cavium-octeon/Kconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | if CPU_CAVIUM_OCTEON | 1 | if CPU_CAVIUM_OCTEON |
| 2 | 2 | ||
| 3 | config CAVIUM_CN63XXP1 | 3 | config CAVIUM_CN63XXP1 |
| 4 | bool "Enable CN63XXP1 errata worarounds" | 4 | bool "Enable CN63XXP1 errata workarounds" |
| 5 | default "n" | 5 | default "n" |
| 6 | help | 6 | help |
| 7 | The CN63XXP1 chip requires build time workarounds to | 7 | The CN63XXP1 chip requires build time workarounds to |
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c index 8f1866d8124d..468ffa043607 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c | |||
| @@ -221,7 +221,7 @@ void __init ltq_soc_init(void) | |||
| 221 | (request_mem_region(res_sys[2].start, | 221 | (request_mem_region(res_sys[2].start, |
| 222 | resource_size(&res_sys[2]), | 222 | resource_size(&res_sys[2]), |
| 223 | res_sys[2].name) < 0)) | 223 | res_sys[2].name) < 0)) |
| 224 | pr_err("Failed to request core reources"); | 224 | pr_err("Failed to request core resources"); |
| 225 | 225 | ||
| 226 | status_membase = ioremap_nocache(res_status.start, | 226 | status_membase = ioremap_nocache(res_status.start, |
| 227 | resource_size(&res_status)); | 227 | resource_size(&res_status)); |
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c index 51804b10a036..2b15491de494 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c | |||
| @@ -318,7 +318,7 @@ void __init ltq_soc_init(void) | |||
| 318 | res_cgu.name) < 0) || | 318 | res_cgu.name) < 0) || |
| 319 | (request_mem_region(res_ebu.start, resource_size(&res_ebu), | 319 | (request_mem_region(res_ebu.start, resource_size(&res_ebu), |
| 320 | res_ebu.name) < 0)) | 320 | res_ebu.name) < 0)) |
| 321 | pr_err("Failed to request core reources"); | 321 | pr_err("Failed to request core resources"); |
| 322 | 322 | ||
| 323 | pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); | 323 | pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); |
| 324 | ltq_cgu_membase = ioremap_nocache(res_cgu.start, | 324 | ltq_cgu_membase = ioremap_nocache(res_cgu.start, |
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index cb1ef9984069..37fe8e7887e2 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c | |||
| @@ -218,7 +218,7 @@ static int ltq_pci_probe(struct platform_device *pdev) | |||
| 218 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 218 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 219 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 219 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
| 220 | if (!res_cfg || !res_bridge) { | 220 | if (!res_cfg || !res_bridge) { |
| 221 | dev_err(&pdev->dev, "missing memory reources\n"); | 221 | dev_err(&pdev->dev, "missing memory resources\n"); |
| 222 | return -EINVAL; | 222 | return -EINVAL; |
| 223 | } | 223 | } |
| 224 | 224 | ||