diff --git a/[refs] b/[refs] index b8d1e35ba5bc..3097fbd7a9a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b2842146cb4105877c2be51d3857ec61ebd4ff9 +refs/heads/master: 2b0137001de68153203dd3bc20e6d27eb7c9719c diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c index 74eca5939bd9..3651b34cc355 100644 --- a/trunk/kernel/time/clocksource.c +++ b/trunk/kernel/time/clocksource.c @@ -186,6 +186,7 @@ void clocksource_reselect(void) } EXPORT_SYMBOL(clocksource_reselect); +#ifdef CONFIG_SYSFS /** * sysfs_show_current_clocksources - sysfs interface for current clocksource * @dev: unused @@ -307,6 +308,7 @@ static int __init init_clocksource_sysfs(void) } device_initcall(init_clocksource_sysfs); +#endif /* CONFIG_SYSFS */ /** * boot_override_clocksource - boot clock override