kernel: update 4.0 to 4.0.5

[openwrt/svn-archive/archive.git] / target / linux / oxnas / patches-4.0 / 310-oxnas-clocksource.patch

diff --git a/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch b/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
index 73d7285af128a05bc30ef0211a97cd58cd99396e..e7bc603382eb1ee234b7c1df3250eae004741b88 100644 (file)
--- a/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
+++ b/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/clocksource/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/clocksource/Kconfig
-+++ linux-4.0-rc4/drivers/clocksource/Kconfig
+--- a/drivers/clocksource/Kconfig
++++ b/drivers/clocksource/Kconfig
 @@ -172,6 +172,12 @@ config VF_PIT_TIMER
        help
          Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
@@ -15,10 +13,8 @@ Index: linux-4.0-rc4/drivers/clocksource/Kconfig
  config SYS_SUPPORTS_SH_CMT
          bool
  
-Index: linux-4.0-rc4/drivers/clocksource/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/clocksource/Makefile
-+++ linux-4.0-rc4/drivers/clocksource/Makefile
+--- a/drivers/clocksource/Makefile
++++ b/drivers/clocksource/Makefile
 @@ -38,6 +38,7 @@ obj-$(CONFIG_CLKSRC_EFM32)   += time-efm32
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)       += exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)      += samsung_pwm_timer.o