diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /drivers/dio | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'drivers/dio')
| -rw-r--r-- | drivers/dio/dio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 10c3c498358c..55dd88d82d6d 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c | |||
| @@ -182,7 +182,7 @@ static int __init dio_init(void) | |||
| 182 | 182 | ||
| 183 | /* Initialize the DIO bus */ | 183 | /* Initialize the DIO bus */ |
| 184 | INIT_LIST_HEAD(&dio_bus.devices); | 184 | INIT_LIST_HEAD(&dio_bus.devices); |
| 185 | strcpy(dio_bus.dev.bus_id, "dio"); | 185 | dev_set_name(&dio_bus.dev, "dio"); |
| 186 | error = device_register(&dio_bus.dev); | 186 | error = device_register(&dio_bus.dev); |
| 187 | if (error) { | 187 | if (error) { |
| 188 | pr_err("DIO: Error registering dio_bus\n"); | 188 | pr_err("DIO: Error registering dio_bus\n"); |
| @@ -237,7 +237,7 @@ static int __init dio_init(void) | |||
| 237 | dev->scode = scode; | 237 | dev->scode = scode; |
| 238 | dev->resource.start = pa; | 238 | dev->resource.start = pa; |
| 239 | dev->resource.end = pa + DIO_SIZE(scode, va); | 239 | dev->resource.end = pa + DIO_SIZE(scode, va); |
| 240 | sprintf(dev->dev.bus_id,"%02x", scode); | 240 | dev_set_name(&dev->dev, "%02x", scode); |
| 241 | 241 | ||
| 242 | /* read the ID byte(s) and encode if necessary. */ | 242 | /* read the ID byte(s) and encode if necessary. */ |
| 243 | prid = DIO_ID(va); | 243 | prid = DIO_ID(va); |