diff options
| author | John Crispin <blogic@openwrt.org> | 2014-11-19 09:19:38 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-11-19 09:19:38 +0000 |
| commit | b598129396cdd929f1c63a8fbdfb00f8b3618460 (patch) | |
| tree | e20cd994a69016bff13c42af1d523e4ce95d6c77 /target/linux/ramips/patches-3.14 | |
| parent | ceb0f117bf7f3950a64002922d4a574e347e7cef (diff) | |
| download | master-187ad058-b598129396cdd929f1c63a8fbdfb00f8b3618460.tar.gz master-187ad058-b598129396cdd929f1c63a8fbdfb00f8b3618460.tar.bz2 master-187ad058-b598129396cdd929f1c63a8fbdfb00f8b3618460.zip | |
ralink: merge the mt7620a/n subtargets
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43300 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.14')
| -rw-r--r-- | target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch new file mode 100644 index 0000000000..6a6f3279f6 --- /dev/null +++ b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch @@ -0,0 +1,14 @@ +Index: linux-3.14.18/arch/mips/ralink/mt7620.c +=================================================================== +--- linux-3.14.18.orig/arch/mips/ralink/mt7620.c 2014-11-18 20:57:21.506801623 +0100 ++++ linux-3.14.18/arch/mips/ralink/mt7620.c 2014-11-18 22:12:05.133116492 +0100 +@@ -511,9 +511,6 @@ + ralink_soc = MT762X_SOC_MT7620N; + name = "MT7620N"; + soc_info->compatible = "ralink,mt7620n-soc"; +-#ifdef CONFIG_PCI +- panic("mt7620n is only supported for non pci kernels"); +-#endif + } + } else if (n0 == MT7620_CHIP_NAME0 && n1 == MT7628_CHIP_NAME1) { + ralink_soc = MT762X_SOC_MT7628AN; |