diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/macintosh/adb.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh/adb.c')
| -rw-r--r-- | drivers/macintosh/adb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 5ae28f076d25..7ce0ea64465c 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
| @@ -854,7 +854,7 @@ adbdev_init(void) | |||
| 854 | adb_dev_class = class_create(THIS_MODULE, "adb"); | 854 | adb_dev_class = class_create(THIS_MODULE, "adb"); |
| 855 | if (IS_ERR(adb_dev_class)) | 855 | if (IS_ERR(adb_dev_class)) |
| 856 | return; | 856 | return; |
| 857 | class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb"); | 857 | device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), "adb"); |
| 858 | 858 | ||
| 859 | platform_device_register(&adb_pfdev); | 859 | platform_device_register(&adb_pfdev); |
| 860 | platform_driver_probe(&adb_pfdrv, adb_dummy_probe); | 860 | platform_driver_probe(&adb_pfdrv, adb_dummy_probe); |