From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [PATCH 16/16] mac_esp: rename irq Date: Mon, 24 Oct 2011 01:11:24 +1100 Message-ID: <20111023141223.838768930@telegraphics.com.au> References: <20111023141108.856998818@telegraphics.com.au> Return-path: Received: from vm4.telegraphics.com.au ([98.124.60.149]:46087 "EHLO vps4.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755634Ab1JWOM2 (ORCPT ); Sun, 23 Oct 2011 10:12:28 -0400 Content-Disposition: inline; filename=mac-esp-irq-name Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Geert Uytterhoeven Cc: linux-m68k@vger.kernel.org, "James E.J. Bottomley" , linux-scsi@vger.kernel.org Rename the "Mac ESP" irq as "ESP" to be consistent with all the other Mac drivers and ESP drivers. Signed-off-by: Finn Thain Index: linux-m68k/drivers/scsi/mac_esp.c =================================================================== --- linux-m68k.orig/drivers/scsi/mac_esp.c 2011-10-23 18:18:46.000000000 +1100 +++ linux-m68k/drivers/scsi/mac_esp.c 2011-10-23 18:19:30.000000000 +1100 @@ -565,8 +565,7 @@ static int __devinit esp_mac_probe(struc esp_chips[dev->id] = esp; mb(); if (esp_chips[!dev->id] == NULL) { - err = request_irq(host->irq, mac_scsi_esp_intr, 0, - "Mac ESP", NULL); + err = request_irq(host->irq, mac_scsi_esp_intr, 0, "ESP", NULL); if (err < 0) { esp_chips[dev->id] = NULL; goto fail_free_priv;