Author: blogic Date: 2014-09-12 08:53:27 +0200 (Fri, 12 Sep 2014) New Revision: 42505
Modified: trunk/target/linux/atheros/config-3.14 trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch Log: atheros: ar2315-pci: rename configuration symbol Rename configuration symbol to be consistent with other MIPS machines. Signed-off-by: Sergey Ryazanov <[email protected]> Modified: trunk/target/linux/atheros/config-3.14 =================================================================== --- trunk/target/linux/atheros/config-3.14 2014-09-12 06:53:21 UTC (rev 42504) +++ trunk/target/linux/atheros/config-3.14 2014-09-12 06:53:27 UTC (rev 42505) @@ -12,7 +12,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ATHEROS_AR2315=y -CONFIG_ATHEROS_AR2315_PCI=y CONFIG_ATHEROS_AR231X=y CONFIG_ATHEROS_AR5312=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -115,6 +114,7 @@ CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=y +CONFIG_PCI_AR2315=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y CONFIG_PERF_USE_VMALLOC=y Modified: trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch =================================================================== --- trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch 2014-09-12 06:53:21 UTC (rev 42504) +++ trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch 2014-09-12 06:53:27 UTC (rev 42505) @@ -1,10 +1,11 @@ --- a/arch/mips/ar231x/Makefile +++ b/arch/mips/ar231x/Makefile -@@ -14,3 +14,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin +@@ -14,3 +14,5 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o -+obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o ++obj-$(CONFIG_PCI_AR2315) += pci.o ++ --- /dev/null +++ b/arch/mips/ar231x/pci.c @@ -0,0 +1,340 @@ @@ -355,8 +356,8 @@ depends on ATHEROS_AR231X default y + -+config ATHEROS_AR2315_PCI -+ bool "PCI support" ++config PCI_AR2315 ++ bool "AR2315 PCI controller support" + depends on ATHEROS_AR2315 + select HW_HAS_PCI + select PCI @@ -367,7 +368,7 @@ do_IRQ(AR2315_IRQ_WLAN0_INTRS); else if (pending & CAUSEF_IP4) do_IRQ(AR2315_IRQ_ENET0_INTRS); -+#ifdef CONFIG_ATHEROS_AR2315_PCI ++#ifdef CONFIG_PCI_AR2315 + else if (pending & CAUSEF_IP5) + do_IRQ(AR2315_IRQ_LCBUS_PCI); +#endif _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
