Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760612AbZAFWcZ (ORCPT ); Tue, 6 Jan 2009 17:32:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756076AbZAFWOO (ORCPT ); Tue, 6 Jan 2009 17:14:14 -0500 Received: from kroah.org ([198.145.64.141]:51330 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754078AbZAFWOK (ORCPT ); Tue, 6 Jan 2009 17:14:10 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Kay Sievers , Jesper Nilsson , Greg Kroah-Hartman Subject: [PATCH 51/60] chris: struct device - replace bus_id with dev_name(), dev_set_name() Date: Tue, 6 Jan 2009 14:12:10 -0800 Message-Id: <1231279939-32728-51-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <20090106221123.GA32689@kroah.com> References: <20090106221123.GA32689@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1209 Lines: 37 From: Kay Sievers Cc: Jesper Nilsson Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- 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 3b3857e..2f8ea0f 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 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) -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/