From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932295AbWFSBH1 (ORCPT ); Sun, 18 Jun 2006 21:07:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932339AbWFSBH1 (ORCPT ); Sun, 18 Jun 2006 21:07:27 -0400 Received: from h-66-166-126-70.lsanca54.covad.net ([66.166.126.70]:6046 "EHLO myri.com") by vger.kernel.org with ESMTP id S932295AbWFSBHZ (ORCPT ); Sun, 18 Jun 2006 21:07:25 -0400 Date: Sun, 18 Jun 2006 21:07:22 -0400 From: Brice Goglin To: linux-pci@atrey.karlin.mff.cuni.cz Cc: LKML Subject: [PATCH 1/8] Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT Message-ID: <20060619010721.GB29950@myri.com> References: <20060619010544.GA29950@myri.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060619010544.GA29950@myri.com> User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org [PATCH 1/8] Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT 0x08 is the HT capability, while PCI_CAP_ID_HT_IRQCONF would be the subtype 0x80 that mpic_scan_ht_pic() uses. Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT. Signed-off-by: Brice Goglin --- arch/powerpc/sysdev/mpic.c | 2 +- include/linux/pci_regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-mm/arch/powerpc/sysdev/mpic.c =================================================================== --- linux-mm.orig/arch/powerpc/sysdev/mpic.c 2006-06-17 22:11:06.000000000 -0400 +++ linux-mm/arch/powerpc/sysdev/mpic.c 2006-06-17 23:07:40.000000000 -0400 @@ -250,7 +250,7 @@ for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0; pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) { u8 id = readb(devbase + pos + PCI_CAP_LIST_ID); - if (id == PCI_CAP_ID_HT_IRQCONF) { + if (id == PCI_CAP_ID_HT) { id = readb(devbase + pos + 3); if (id == 0x80) break; Index: linux-mm/include/linux/pci_regs.h =================================================================== --- linux-mm.orig/include/linux/pci_regs.h 2006-06-17 22:11:06.000000000 -0400 +++ linux-mm/include/linux/pci_regs.h 2006-06-17 23:07:40.000000000 -0400 @@ -196,7 +196,7 @@ #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ -#define PCI_CAP_ID_HT_IRQCONF 0x08 /* HyperTransport IRQ Configuration */ +#define PCI_CAP_ID_HT 0x08 /* HyperTransport */ #define PCI_CAP_ID_VNDR 0x09 /* Vendor specific capability */ #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ #define PCI_CAP_ID_EXP 0x10 /* PCI Express */