diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:24:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:24:26 -0800 |
| commit | 5643f000c1e10ab991182478b76550e1364c3570 (patch) | |
| tree | 950b2f61a5dd742de1c668ba968a9c8a99f1eab6 /arch/um/drivers/ubd_kern.c | |
| parent | 177294d19174cf92de22434bb1fc9a8ecdbbe658 (diff) | |
| parent | 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Diffstat (limited to 'arch/um/drivers/ubd_kern.c')
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index b2c86257b0f..93898917cbe 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -823,9 +823,10 @@ static int ubd_mc_init(void) __initcall(ubd_mc_init); -static struct device_driver ubd_driver = { - .name = DRIVER_NAME, - .bus = &platform_bus_type, +static struct platform_driver ubd_driver = { + .driver = { + .name = DRIVER_NAME, + }, }; int ubd_init(void) @@ -850,7 +851,7 @@ int ubd_init(void) if (register_blkdev(fake_major, "ubd")) return -1; } - driver_register(&ubd_driver); + platform_driver_register(&ubd_driver); for (i = 0; i < MAX_DEV; i++) ubd_add(i); return 0; |