diff options
| author | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/zorro/proc.c | |
| parent | ftrace: only trace preempt off with preempt tracer (diff) | |
| parent | Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
| download | kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'drivers/zorro/proc.c')
| -rw-r--r-- | drivers/zorro/proc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 099b6fb5b5cb..d47c47fc048f 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c @@ -1,6 +1,4 @@ /* - * $Id: proc.c,v 1.1.2.1 1998/06/07 23:21:01 geert Exp $ - * * Procfs interface for the Zorro bus. * * Copyright (C) 1998-2003 Geert Uytterhoeven @@ -160,4 +158,4 @@ static int __init zorro_proc_init(void) return 0; } -__initcall(zorro_proc_init); +device_initcall(zorro_proc_init); |