Skip to content
Snippets Groups Projects
Commit edc7ab52 authored by Hauke Mehrtens's avatar Hauke Mehrtens
Browse files

brcm47xx: move patches already in the mainline kernel to the front

SVN-Revision: 34987
parent 76c767f1
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@
#include <asm/bootinfo.h>
#include <asm/fw/cfe/cfe_api.h>
#include <asm/fw/cfe/cfe_error.h>
@@ -59,6 +60,7 @@ static __init void prom_init_mem(void)
@@ -127,6 +128,7 @@ static __init void prom_init_mem(void)
{
unsigned long mem;
unsigned long max;
......@@ -16,7 +16,7 @@
/* Figure out memory size by finding aliases.
*
@@ -87,6 +89,14 @@ static __init void prom_init_mem(void)
@@ -155,6 +157,14 @@ static __init void prom_init_mem(void)
break;
}
......
......@@ -8,7 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,6 +61,7 @@ static __init void prom_init_mem(void)
@@ -128,6 +129,7 @@ static __init void prom_init_mem(void)
{
unsigned long mem;
unsigned long max;
......@@ -16,7 +16,7 @@
struct cpuinfo_mips *c = &current_cpu_data;
/* Figure out memory size by finding aliases.
@@ -77,15 +79,15 @@ static __init void prom_init_mem(void)
@@ -145,15 +147,15 @@ static __init void prom_init_mem(void)
* max contains the biggest possible address supported by the platform.
* If the method wants to try something above we assume 128MB ram.
*/
......
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -206,6 +206,8 @@ static int bcm47xx_get_sprom_bcma(struct
@@ -175,6 +175,8 @@ static int bcm47xx_get_sprom_bcma(struct
snprintf(prefix, sizeof(prefix), "sb/%u/",
core->core_index);
bcm47xx_fill_sprom(out, prefix);
......
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -96,7 +96,7 @@ static int bcm47xx_get_sprom_ssb(struct
@@ -94,7 +94,7 @@ static int bcm47xx_get_sprom_ssb(struct
snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
bus->host_pci->bus->number + 1,
PCI_SLOT(bus->host_pci->devfn));
......@@ -9,7 +9,7 @@
return 0;
} else {
printk(KERN_WARNING "bcm47xx: unable to fill SPROM for given bustype.\n");
@@ -115,7 +115,7 @@ static int bcm47xx_get_invariants(struct
@@ -113,7 +113,7 @@ static int bcm47xx_get_invariants(struct
bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
......@@ -18,7 +18,7 @@
if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
@@ -196,18 +196,17 @@ static int bcm47xx_get_sprom_bcma(struct
@@ -165,18 +165,17 @@ static int bcm47xx_get_sprom_bcma(struct
snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
bus->host_pci->bus->number + 1,
PCI_SLOT(bus->host_pci->devfn));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment