summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/adb.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-16 15:13:42 +0200
committerPaul Mackerras <paulus@samba.org>2008-05-16 15:13:42 +0200
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch)
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/macintosh/adb.c
parent[POWERPC] Fix sparse warnings in arch/powerpc/platforms/pseries (diff)
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff)
downloadlinux-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz
linux-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/macintosh/adb.c')
-rw-r--r--drivers/macintosh/adb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index b8b9e44f7f4e..dbaad39020a1 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -334,7 +334,7 @@ int __init adb_init(void)
return 0;
}
-__initcall(adb_init);
+device_initcall(adb_init);
static int
do_adb_reset_bus(void)