Manual merge with Linus

This commit is contained in:
Dmitry Torokhov
2005-09-09 20:14:47 -05:00
3056 changed files with 144611 additions and 124862 deletions

View File

@@ -233,8 +233,7 @@ static void kd_nosound(unsigned long ignored)
}
}
static struct timer_list kd_mksound_timer =
TIMER_INITIALIZER(kd_nosound, 0, 0);
static DEFINE_TIMER(kd_mksound_timer, kd_nosound, 0, 0);
void kd_mksound(unsigned int hz, unsigned int ticks)
{