diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 10:44:42 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 10:44:42 -0800 |
| commit | 4383fc3d9a98759a1ec3c57a30781e95a4cfcfa9 (patch) | |
| tree | 592280e529e646b89933fd5c3e6728bd28839933 /arch/cris | |
| parent | 6ff4dd36d6386f6fb3e1e4eac56f0d22d59a1d5c (diff) | |
| download | linux-4383fc3d9a98759a1ec3c57a30781e95a4cfcfa9.tar.bz2 | |
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 @@ #error "Please contact <greg@kroah.com> for details on how to fix it properly." static struct device iop_spu_device[2] = { - { .bus_id = "iop-spu0", }, - { .bus_id = "iop-spu1", }, + { .init_name = "iop-spu0", }, + { .init_name = "iop-spu1", }, }; static struct device iop_mpu_device = { - .bus_id = "iop-mpu", + .init_name = "iop-mpu", }; static int wait_mpu_idle(void) |