aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-02-08 21:27:13 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-02-08 21:27:13 +0000
commit354e72a03a18bca7c7aec7fc8a5985033bf2f80d (patch)
treeed2dd06b1c2a42269533d671f33a01087d3feac3 /target/linux
parent5bd4c4e26de4c2607b68aec117cb6b2be3014892 (diff)
downloadupstream-354e72a03a18bca7c7aec7fc8a5985033bf2f80d.tar.gz
upstream-354e72a03a18bca7c7aec7fc8a5985033bf2f80d.tar.bz2
upstream-354e72a03a18bca7c7aec7fc8a5985033bf2f80d.zip
refresh patch
SVN-Revision: 19557
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch9
1 files changed, 3 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch b/target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch
index 752b03ba23..69370d0656 100644
--- a/target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch
@@ -6,20 +6,17 @@ Signed-off-by: Aaro Koskinen <aaro.koskinen <at> iki.fi>
kernel/time/clocksource.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
-diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
-index 5155dc3..7b3a9d0 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -502,6 +502,11 @@ static void clocksource_select(void)
-
+
#else /* CONFIG_GENERIC_TIME */
-
+
+static inline u64 clocksource_max_deferment(struct clocksource *cs)
+{
+ return 0;
+}
+
static inline void clocksource_select(void) { }
-
+
#endif
-