diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /arch/um/kernel/time_kern.c | |
| parent | fd88de569b802c4a04aaa6ee74667775f4aed8c6 (diff) | |
| parent | d8c3291c73b958243b33f8509d4507e76dafd055 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/kernel/time_kern.c')
| -rw-r--r-- | arch/um/kernel/time_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 3c7626cdba4b..528cf623f8b4 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c | |||
| @@ -209,4 +209,4 @@ int __init timer_init(void) | |||
| 209 | return(0); | 209 | return(0); |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | __initcall(timer_init); | 212 | arch_initcall(timer_init); |