Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751664Ab1EOTK2 (ORCPT ); Sun, 15 May 2011 15:10:28 -0400 Received: from relay01.digicable.hu ([92.249.128.189]:38079 "EHLO relay01.digicable.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751185Ab1EOTK0 (ORCPT ); Sun, 15 May 2011 15:10:26 -0400 Message-ID: <4DD024ED.9000509@freemail.hu> Date: Sun, 15 May 2011 21:09:33 +0200 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: "H. Peter Anvin" CC: Thomas Gleixner , Ingo Molnar , x86@kernel.org, Tony Luck , Fenghua Yu , linux-ia64@vger.kernel.org, Julia Lawall , LKML Subject: [PATCH] x86 pci acpi: rename struct pci_root_info References: <4DCEB5BB.1080202@freemail.hu> <4DCEC4EB.2050107@zytor.com> In-Reply-To: <4DCEC4EB.2050107@zytor.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Original: 94.21.203.108 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2305 Lines: 71 From: Márton Németh Rename struct pci_root_info to struct acpi_pci_root_info in arch/x86/pci/acpi.c because there is already a struct pci_root_info declared in arch/x86/pci/bus_numa.h . They both belnog to x86 architecture and the two declarations differ, so after rename each will have a unique name. Signed-off-by: Márton Németh --- --- linux-2.6.39-rc7/arch/x86/pci/acpi.c.orig 2011-05-10 04:33:54.000000000 +0200 +++ linux-2.6.39-rc7/arch/x86/pci/acpi.c 2011-05-15 17:02:52.000000000 +0200 @@ -7,7 +7,7 @@ #include #include -struct pci_root_info { +struct acpi_pci_root_info { struct acpi_device *bridge; char *name; unsigned int res_num; @@ -120,7 +120,7 @@ resource_to_addr(struct acpi_resource *r static acpi_status count_resource(struct acpi_resource *acpi_res, void *data) { - struct pci_root_info *info = data; + struct acpi_pci_root_info *info = data; struct acpi_resource_address64 addr; acpi_status status; @@ -133,7 +133,7 @@ count_resource(struct acpi_resource *acp static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data) { - struct pci_root_info *info = data; + struct acpi_pci_root_info *info = data; struct resource *res; struct acpi_resource_address64 addr; acpi_status status; @@ -188,7 +188,7 @@ static bool resource_contains(struct res return false; } -static void coalesce_windows(struct pci_root_info *info, int type) +static void coalesce_windows(struct acpi_pci_root_info *info, int type) { int i, j; struct resource *res1, *res2; @@ -223,7 +223,7 @@ static void coalesce_windows(struct pci_ } } -static void add_resources(struct pci_root_info *info) +static void add_resources(struct acpi_pci_root_info *info) { int i; struct resource *res, *root, *conflict; @@ -259,7 +259,7 @@ static void get_current_resources(struct acpi_device *device, int busnum, int domain, struct pci_bus *bus) { - struct pci_root_info info; + struct acpi_pci_root_info info; size_t size; if (pci_use_crs) -- 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/