diff --git a/[refs] b/[refs] index bfa00ab91d05..8eecc00a6ebc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a284b0518d2fe27cdde19485c8fe077a128cd827 +refs/heads/master: 7aa6ec56b9e9e95eb6c83516ddbb6159fd11c224 diff --git a/trunk/arch/x86_64/kernel/hpet.c b/trunk/arch/x86_64/kernel/hpet.c index 636f4f9fc6bb..e2d1b912e154 100644 --- a/trunk/arch/x86_64/kernel/hpet.c +++ b/trunk/arch/x86_64/kernel/hpet.c @@ -133,7 +133,7 @@ struct clocksource clocksource_hpet = { .vread = vread_hpet, }; -int hpet_arch_init(void) +int __init hpet_arch_init(void) { unsigned int id; u64 tmp;