diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
commit | 72d1d554f3f6cb6132831a2c716f91f81619339f (patch) | |
tree | 4a3f56e2ebf8f1a7727e46823869007241bef383 /target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch | |
parent | b0364064f437100a45a81cbbb636cbf4260ce5ff (diff) | |
download | master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.gz master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.bz2 master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.zip |
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch b/target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch index bfa93af41c..105c65142a 100644 --- a/target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch +++ b/target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch @@ -22,11 +22,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> include/linux/bcm47xx_nvram.h | 15 +++++++++++ 2 files changed, 60 insertions(+), 15 deletions(-) -diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c -index 95d028c..2ed762e 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -94,17 +94,22 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) +@@ -94,17 +94,22 @@ static int nvram_find_and_copy(void __io return -ENXIO; found: @@ -94,7 +92,7 @@ index 95d028c..2ed762e 100644 return 0; } #endif -@@ -219,3 +226,26 @@ int bcm47xx_nvram_gpio_pin(const char *name) +@@ -219,3 +226,26 @@ int bcm47xx_nvram_gpio_pin(const char *n return -ENOENT; } EXPORT_SYMBOL(bcm47xx_nvram_gpio_pin); @@ -121,8 +119,6 @@ index 95d028c..2ed762e 100644 + return nvram; +} +EXPORT_SYMBOL(bcm47xx_nvram_get_contents); -diff --git a/include/linux/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h -index b12b07e..c73927c 100644 --- a/include/linux/bcm47xx_nvram.h +++ b/include/linux/bcm47xx_nvram.h @@ -10,11 +10,17 @@ @@ -143,7 +139,7 @@ index b12b07e..c73927c 100644 #else static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim) { -@@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin(const char *name) +@@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin { return -ENOTSUPP; }; @@ -159,6 +155,3 @@ index b12b07e..c73927c 100644 #endif #endif /* __BCM47XX_NVRAM_H */ --- -1.8.4.5 - |