projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.18 to 3.18.14
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
brcm47xx
/
patches-3.18
/
030-03-MIPS-BCM47XX-Make-bcma-init-NVRAM-instead-of-bcm47xx.patch
diff --git
a/target/linux/brcm47xx/patches-3.18/030-03-MIPS-BCM47XX-Make-bcma-init-NVRAM-instead-of-bcm47xx.patch
b/target/linux/brcm47xx/patches-3.18/030-03-MIPS-BCM47XX-Make-bcma-init-NVRAM-instead-of-bcm47xx.patch
index a616fcc0e01b594f79051afcdb93a796044f227e..000e4b5ac4891b00e0cf3cf191cc0f7ca9a3dc94 100644
(file)
--- a/
target/linux/brcm47xx/patches-3.18/030-03-MIPS-BCM47XX-Make-bcma-init-NVRAM-instead-of-bcm47xx.patch
+++ b/
target/linux/brcm47xx/patches-3.18/030-03-MIPS-BCM47XX-Make-bcma-init-NVRAM-instead-of-bcm47xx.patch
@@
-20,11
+20,9
@@
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/bcma/driver_mips.c | 13 +++++++++++--
2 files changed, 13 insertions(+), 42 deletions(-)
drivers/bcma/driver_mips.c | 13 +++++++++++--
2 files changed, 13 insertions(+), 42 deletions(-)
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index fecc5ae..21712fb 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
-@@ -121,48 +121,10 @@ int bcm47xx_nvram_init_from_mem(u32 base
, u32 lim)
+@@ -121,48 +121,10 @@ int bcm47xx_nvram_init_from_mem(u32 base
return err;
}
return err;
}
@@
-75,8
+73,6
@@
index fecc5ae..21712fb 100644
return -ENXIO;
}
return -ENXIO;
}
-diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
-index 004d6aa..8a653dc 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -20,6 +20,9 @@
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -20,6 +20,9 @@
@@
-89,7
+85,7
@@
index 004d6aa..8a653dc 100644
enum bcma_boot_dev {
BCMA_BOOT_DEV_UNK = 0,
enum bcma_boot_dev {
BCMA_BOOT_DEV_UNK = 0,
-@@ -316,10 +319,16 @@ static void bcma_core_mips_flash_detect(
struct bcma_drv_mips *mcore)
+@@ -316,10 +319,16 @@ static void bcma_core_mips_flash_detect(
switch (boot_dev) {
case BCMA_BOOT_DEV_PARALLEL:
case BCMA_BOOT_DEV_SERIAL:
switch (boot_dev) {
case BCMA_BOOT_DEV_PARALLEL:
case BCMA_BOOT_DEV_SERIAL:
@@
-108,6
+104,3
@@
index 004d6aa..8a653dc 100644
break;
default:
break;
break;
default:
break;
---
-1.8.4.5
-