diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/char/mwave/mwavedd.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/char/mwave/mwavedd.c')
| -rw-r--r-- | drivers/char/mwave/mwavedd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index 4f8d67fed292..94ad2c3bfc4a 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c | |||
| @@ -663,7 +663,7 @@ static int __init mwave_init(void) | |||
| 663 | #if 0 | 663 | #if 0 |
| 664 | /* sysfs */ | 664 | /* sysfs */ |
| 665 | memset(&mwave_device, 0, sizeof (struct device)); | 665 | memset(&mwave_device, 0, sizeof (struct device)); |
| 666 | snprintf(mwave_device.bus_id, BUS_ID_SIZE, "mwave"); | 666 | dev_set_name(&mwave_device, "mwave"); |
| 667 | 667 | ||
| 668 | if (device_register(&mwave_device)) | 668 | if (device_register(&mwave_device)) |
| 669 | goto cleanup_error; | 669 | goto cleanup_error; |