aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/arch-v32
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-06 10:44:42 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 10:44:42 -0800
commit4383fc3d9a98759a1ec3c57a30781e95a4cfcfa9 (patch)
tree592280e529e646b89933fd5c3e6728bd28839933 /arch/cris/arch-v32
parent6ff4dd36d6386f6fb3e1e4eac56f0d22d59a1d5c (diff)
downloadvexpress-lsk-4383fc3d9a98759a1ec3c57a30781e95a4cfcfa9.tar.gz
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/arch-v32')
-rw-r--r--arch/cris/arch-v32/drivers/iop_fw_load.c6
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 3b3857ec1f1..2f8ea0f7a63 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)