diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
commit | b9c13dc540403877ee43369ce0027f43c7cab928 (patch) | |
tree | dec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch | |
parent | 966f1ab30128279f7b07acda088f4f3399718867 (diff) | |
download | upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2 upstream-b9c13dc540403877ee43369ce0027f43c7cab928.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>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch b/target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch index c74bd06495..7a3ddc3980 100644 --- a/target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch +++ b/target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch @@ -22,8 +22,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> arch/mips/bcm47xx/nvram.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c -index dee1c32..95d028c 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -171,7 +171,7 @@ static int nvram_init(void) @@ -35,7 +33,7 @@ index dee1c32..95d028c 100644 if (!name) return -EINVAL; -@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) +@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *nam /* Look for name=value and return value */ var = &nvram_buf[sizeof(struct nvram_header)]; @@ -59,6 +57,3 @@ index dee1c32..95d028c 100644 } return -ENOENT; } --- -1.8.4.5 - |