diff --git a/[refs] b/[refs] index dfcbebe4795f..a0e082c50a47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4818900fa3ee1c56e96f6dede7cc4c05ed383d1 +refs/heads/master: 199e7056895c8427dec63e1d9841ceafcfaaf314 diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c index a0502aef43ce..bbc8ca194b59 100644 --- a/trunk/kernel/time.c +++ b/trunk/kernel/time.c @@ -619,6 +619,8 @@ mktime(const unsigned int year0, const unsigned int mon0, )*60 + sec; /* finally seconds */ } +EXPORT_SYMBOL(mktime); + /** * set_normalized_timespec - set timespec sec and nsec parts and normalize *