diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 13:44:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:42 -0500 |
commit | 4383fc3d9a98759a1ec3c57a30781e95a4cfcfa9 (patch) | |
tree | 592280e529e646b89933fd5c3e6728bd28839933 /arch/cris | |
parent | 6ff4dd36d6386f6fb3e1e4eac56f0d22d59a1d5c (diff) |
chris: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v32/drivers/iop_fw_load.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/drivers/iop_fw_load.c b/arch/cris/arch-v32/drivers/iop_fw_load.c index 3b3857ec1f15..2f8ea0f7a63c 100644 --- a/arch/cris/arch-v32/drivers/iop_fw_load.c +++ b/arch/cris/arch-v32/drivers/iop_fw_load.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #error "Please contact <greg@kroah.com> for details on how to fix it properly." | 24 | #error "Please contact <greg@kroah.com> for details on how to fix it properly." |
25 | 25 | ||
26 | static struct device iop_spu_device[2] = { | 26 | static struct device iop_spu_device[2] = { |
27 | { .bus_id = "iop-spu0", }, | 27 | { .init_name = "iop-spu0", }, |
28 | { .bus_id = "iop-spu1", }, | 28 | { .init_name = "iop-spu1", }, |
29 | }; | 29 | }; |
30 | 30 | ||
31 | static struct device iop_mpu_device = { | 31 | static struct device iop_mpu_device = { |
32 | .bus_id = "iop-mpu", | 32 | .init_name = "iop-mpu", |
33 | }; | 33 | }; |
34 | 34 | ||
35 | static int wait_mpu_idle(void) | 35 | static int wait_mpu_idle(void) |