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/xtensa/platform-iss | |
| parent | 177294d19174cf92de22434bb1fc9a8ecdbbe658 (diff) | |
| parent | 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24 (diff) | |
| download | kernel-crypto-5643f000c1e10ab991182478b76550e1364c3570.tar.gz kernel-crypto-5643f000c1e10ab991182478b76550e1364c3570.tar.xz kernel-crypto-5643f000c1e10ab991182478b76550e1364c3570.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Diffstat (limited to 'arch/xtensa/platform-iss')
| -rw-r--r-- | arch/xtensa/platform-iss/network.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index 96b9bb4a478..0dc55cc8691 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c @@ -616,9 +616,10 @@ void iss_net_user_timer_expire(unsigned long _conn) } -static struct device_driver iss_net_driver = { - .name = DRIVER_NAME, - .bus = &platform_bus_type, +static struct platform_driver iss_net_driver = { + .driver = { + .name = DRIVER_NAME, + }, }; static int driver_registered; @@ -669,7 +670,7 @@ static int iss_net_configure(int index, char *init) /* sysfs register */ if (!driver_registered) { - driver_register(&iss_net_driver); + platform_driver_register(&iss_net_driver); driver_registered = 1; } |