diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch) | |
| tree | b35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch | |
| parent | a899dbd4e32835b0a1d917479d10e5a2744c273c (diff) | |
| download | master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2 master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch')
| -rw-r--r-- | target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch index 1eb74debcf..1795a2a229 100644 --- a/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch +++ b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/clocksource/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/clocksource/Kconfig -+++ linux-3.14.18/drivers/clocksource/Kconfig +--- a/drivers/clocksource/Kconfig ++++ b/drivers/clocksource/Kconfig @@ -140,3 +140,9 @@ config VF_PIT_TIMER bool help @@ -12,10 +10,8 @@ Index: linux-3.14.18/drivers/clocksource/Kconfig + select CLKSRC_MMIO + help + This option enables support for the oxnas rps timers. -Index: linux-3.14.18/drivers/clocksource/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/clocksource/Makefile -+++ linux-3.14.18/drivers/clocksource/Makefile +--- a/drivers/clocksource/Makefile ++++ b/drivers/clocksource/Makefile @@ -37,3 +37,5 @@ obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arc obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o |