aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
commit2f99e562e03487b927782fcd0f690346d71c34e1 (patch)
tree0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
parent0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff)
downloadupstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 backport of r47334. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch')
-rw-r--r--target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch b/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
index 815b1c7447..ff74df55ce 100644
--- a/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
+++ b/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
-@@ -511,9 +511,6 @@ void prom_soc_init(struct ralink_soc_inf
+@@ -535,9 +535,6 @@ void prom_soc_init(struct ralink_soc_inf
ralink_soc = MT762X_SOC_MT7620N;
name = "MT7620N";
soc_info->compatible = "ralink,mt7620n-soc";
@@ -9,4 +9,4 @@
-#endif
}
} else if (n0 == MT7620_CHIP_NAME0 && n1 == MT7628_CHIP_NAME1) {
- ralink_soc = MT762X_SOC_MT7628AN;
+ u32 efuse = __raw_readl(sysc + SYSC_REG_EFUSE_CFG);