Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755664AbYFVQbT (ORCPT ); Sun, 22 Jun 2008 12:31:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751926AbYFVQbJ (ORCPT ); Sun, 22 Jun 2008 12:31:09 -0400 Received: from smtp4.pp.htv.fi ([213.243.153.38]:49985 "EHLO smtp4.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbYFVQbH (ORCPT ); Sun, 22 Jun 2008 12:31:07 -0400 Date: Sun, 22 Jun 2008 19:29:17 +0300 From: Adrian Bunk To: Andrew Morton , Linus Torvalds , James Bottomley Cc: Toralf =?utf-8?Q?F=C3=B6rster?= , Randy Dunlap , linux-kernel@vger.kernel.org Subject: [2.6.26 patch] fix the request_firmware() dummy Message-ID: <20080622162917.GB20122@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1644 Lines: 51 From: James Bottomley > the build (.config attached) failed, make ends with : > ... > UPD include/linux/compile.h > CC init/version.o > LD init/built-in.o > LD vmlinux > drivers/built-in.o: In function `sas_request_addr': > (.text+0x33bab): undefined reference to `request_firmware' > drivers/built-in.o: In function `sas_request_addr': > (.text+0x33c3f): undefined reference to `release_firmware' > make: *** [vmlinux] Error 1 There's a slight fault in the stub logic. It fails for FW_LOADER=m and the user =y. This should fix it. This patch fixes the following 2.6.26-rc regression: http://bugzilla.kernel.org/show_bug.cgi?id=10730 Reported-by: Toralf Förster Signed-off-by: Adrian Bunk --- @James: Please complain if you consider my forwarding of your patch inappropriate. diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 4d10c73..6c7eff2 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -13,7 +13,7 @@ struct firmware { struct device; -#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) +#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE)) int request_firmware(const struct firmware **fw, const char *name, struct device *device); int request_firmware_nowait( -- 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/