From patchwork Sat Jan 15 20:01:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 481501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0FK339I001626 for ; Sat, 15 Jan 2011 20:03:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753854Ab1AOUCr (ORCPT ); Sat, 15 Jan 2011 15:02:47 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:38781 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753793Ab1AOUCq (ORCPT ); Sat, 15 Jan 2011 15:02:46 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 1791D19FA5C; Sat, 15 Jan 2011 20:48:42 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30681-04; Sat, 15 Jan 2011 20:48:19 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id DC53119F506; Sat, 15 Jan 2011 20:48:19 +0100 (CET) From: "Rafael J. Wysocki" To: Stephen Rothwell , Jesse Barnes Subject: Re: linux-next: build failure after merge of the final tree (linus' tree related) Date: Sat, 15 Jan 2011 21:01:57 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ozan Caglayan , Linus , ACPI Devel Maling List , linux-pci@vger.kernel.org References: <20110115133412.58b8cd89.sfr@canb.auug.org.au> <201101151419.16758.rjw@sisk.pl> <20110116024434.3a5ccabb.sfr@canb.auug.org.au> In-Reply-To: <20110116024434.3a5ccabb.sfr@canb.auug.org.au> MIME-Version: 1.0 Message-Id: <201101152101.57533.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 15 Jan 2011 20:03:04 +0000 (UTC) Index: linux-2.6/include/linux/pci-acpi.h =================================================================== --- linux-2.6.orig/include/linux/pci-acpi.h +++ linux-2.6/include/linux/pci-acpi.h @@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_b return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), pbus->number); } -#else -static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) -{ return NULL; } #endif #ifdef CONFIG_ACPI_APEI