summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-16 23:13:42 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-16 23:13:42 +1000
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch)
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/macintosh
parent541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff)
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
downloadop-kernel-dev-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip
op-kernel-dev-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.gz
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/macintosh')
-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 b8b9e44..dbaad39 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)
OpenPOWER on IntegriCloud