diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /drivers/firmware/dmi-id.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/firmware/dmi-id.c')
| -rw-r--r-- | drivers/firmware/dmi-id.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index e880d6c8d89..5a76d056b9d 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -223,7 +223,7 @@ static int __init dmi_id_init(void) } dmi_dev->class = &dmi_class; - strcpy(dmi_dev->bus_id, "id"); + dev_set_name(dmi_dev, "id"); dmi_dev->groups = sys_dmi_attribute_groups; ret = device_register(dmi_dev); |