kernel: bump 4.14 to 4.14.48 for 18.06

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 310-msm-adhoc-bus-support.patch

diff --git a/target/linux/ipq806x/patches-4.14/310-msm-adhoc-bus-support.patch b/target/linux/ipq806x/patches-4.14/310-msm-adhoc-bus-support.patch
index 56f114874c01c62abf5ce78393d9707427a5e536..cd9fd895c55e02ede3755cc1202e61b767e85d5b 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/310-msm-adhoc-bus-support.patch
+++ b/target/linux/ipq806x/patches-4.14/310-msm-adhoc-bus-support.patch
@@ -7,20 +7,20 @@ Subject: BUS: add MSM_BUS
  obj-$(CONFIG_MIPS_CDMM)               += mips_cdmm.o
  obj-$(CONFIG_MVEBU_MBUS)      += mvebu-mbus.o
 +obj-$(CONFIG_BUS_TOPOLOGY_ADHOC)+= msm_bus/
-
+ 
  # Interconnect bus driver for OMAP SoCs.
  obj-$(CONFIG_OMAP_INTERCONNECT)       += omap_l3_smx.o omap_l3_noc.o
 --- a/drivers/bus/Kconfig
 +++ b/drivers/bus/Kconfig
 @@ -93,6 +93,8 @@ config MVEBU_MBUS
-         Driver needed for the MBus configuration on Marvell EBU SoCs
-         (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).
-
+         Driver needed for the MBus configuration on Marvell EBU SoCs
+         (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).
+ 
 +source "drivers/bus/msm_bus/Kconfig"
 +
  config OMAP_INTERCONNECT
-       tristate "OMAP INTERCONNECT DRIVER"
-       depends on ARCH_OMAP2PLUS
+       tristate "OMAP INTERCONNECT DRIVER"
+       depends on ARCH_OMAP2PLUS
 --- /dev/null
 +++ b/include/dt-bindings/msm/msm-bus-ids.h
 @@ -0,0 +1,869 @@