diff options
Diffstat (limited to 'arch/um/drivers')
-rw-r--r-- | arch/um/drivers/net_kern.c | 9 | ||||
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 4cf31a2ae19c..84c73a300acb 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -268,9 +268,10 @@ void uml_net_user_timer_expire(unsigned long _conn) | |||
268 | static DEFINE_SPINLOCK(devices_lock); | 268 | static DEFINE_SPINLOCK(devices_lock); |
269 | static struct list_head devices = LIST_HEAD_INIT(devices); | 269 | static struct list_head devices = LIST_HEAD_INIT(devices); |
270 | 270 | ||
271 | static struct device_driver uml_net_driver = { | 271 | static struct platform_driver uml_net_driver = { |
272 | .name = DRIVER_NAME, | 272 | .driver = { |
273 | .bus = &platform_bus_type, | 273 | .name = DRIVER_NAME, |
274 | }, | ||
274 | }; | 275 | }; |
275 | static int driver_registered; | 276 | static int driver_registered; |
276 | 277 | ||
@@ -317,7 +318,7 @@ static int eth_configure(int n, void *init, char *mac, | |||
317 | 318 | ||
318 | /* sysfs register */ | 319 | /* sysfs register */ |
319 | if (!driver_registered) { | 320 | if (!driver_registered) { |
320 | driver_register(¨_net_driver); | 321 | platform_driver_register(¨_net_driver); |
321 | driver_registered = 1; | 322 | driver_registered = 1; |
322 | } | 323 | } |
323 | device->pdev.id = n; | 324 | device->pdev.id = n; |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index b2c86257b0f8..93898917cbe5 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) | |||
823 | 823 | ||
824 | __initcall(ubd_mc_init); | 824 | __initcall(ubd_mc_init); |
825 | 825 | ||
826 | static struct device_driver ubd_driver = { | 826 | static struct platform_driver ubd_driver = { |
827 | .name = DRIVER_NAME, | 827 | .driver = { |
828 | .bus = &platform_bus_type, | 828 | .name = DRIVER_NAME, |
829 | }, | ||
829 | }; | 830 | }; |
830 | 831 | ||
831 | int ubd_init(void) | 832 | int ubd_init(void) |
@@ -850,7 +851,7 @@ int ubd_init(void) | |||
850 | if (register_blkdev(fake_major, "ubd")) | 851 | if (register_blkdev(fake_major, "ubd")) |
851 | return -1; | 852 | return -1; |
852 | } | 853 | } |
853 | driver_register(&ubd_driver); | 854 | platform_driver_register(&ubd_driver); |
854 | for (i = 0; i < MAX_DEV; i++) | 855 | for (i = 0; i < MAX_DEV; i++) |
855 | ubd_add(i); | 856 | ubd_add(i); |
856 | return 0; | 857 | return 0; |