kernel: update 3.14 to 3.14.18

[openwrt/staging/lynxis.git] / target / linux / ipq806x / patches / 0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch

diff --git a/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch b/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch
index 837ec9d0c5703a37c5ba951aa6caef2d38abb59f..5f173fb520831137d8c6e87a05d5ebfdc1c3df83 100644 (file)
--- a/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch
+++ b/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch
@@ -27,8 +27,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  3 files changed, 8 insertions(+)
  create mode 100644 drivers/soc/Kconfig
 
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index e0a4ae6..a299cbd 100644
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
 @@ -132,6 +132,8 @@ source "drivers/staging/Kconfig"
@@ -40,8 +38,6 @@ index e0a4ae6..a299cbd 100644
  source "drivers/clk/Kconfig"
  
  source "drivers/hwspinlock/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 3d6de8b..4c2bdc1 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
 @@ -33,6 +33,9 @@ obj-y                                += amba/
@@ -54,15 +50,9 @@ index 3d6de8b..4c2bdc1 100644
  obj-$(CONFIG_VIRTIO)          += virtio/
  obj-$(CONFIG_XEN)             += xen/
  
-diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
-new file mode 100644
-index 0000000..339baa8
 --- /dev/null
 +++ b/drivers/soc/Kconfig
 @@ -0,0 +1,3 @@
 +menu "SOC (System On Chip) specific Drivers"
 +
 +endmenu
--- 
-1.7.10.4
-