diff --git a/[refs] b/[refs] index 9af5f92853ab..fada6496ef55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 487748ca3eea6f951185b4c5d0b0c02eea4d053b +refs/heads/master: d7dda9875b84eb6c2828592b17aa173ac17bf75d diff --git a/trunk/arch/arm/mach-ks8695/time.c b/trunk/arch/arm/mach-ks8695/time.c index ae9daccca4c1..6974c2355601 100644 --- a/trunk/arch/arm/mach-ks8695/time.c +++ b/trunk/arch/arm/mach-ks8695/time.c @@ -127,7 +127,6 @@ static void __init ks8695_timer_init (void) struct sys_timer ks8695_timer = { .init = ks8695_timer_init, .offset = ks8695_gettimeoffset, - .resume = ks8695_timer_setup, }; void ks8695_restart(char mode, const char *cmd)