Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754484AbZJZWOc (ORCPT ); Mon, 26 Oct 2009 18:14:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754119AbZJZWOb (ORCPT ); Mon, 26 Oct 2009 18:14:31 -0400 Received: from acsinet11.oracle.com ([141.146.126.233]:49658 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753873AbZJZWOa (ORCPT ); Mon, 26 Oct 2009 18:14:30 -0400 Date: Mon, 26 Oct 2009 15:09:45 -0700 From: Randy Dunlap To: Stephen Rothwell , netdev Cc: linux-next@vger.kernel.org, LKML , davem@davemloft.net, Dhananjay Phadke Subject: [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n Message-Id: <20091026150945.3f35a811.randy.dunlap@oracle.com> In-Reply-To: <20091026172104.205f15af.sfr@canb.auug.org.au> References: <20091026172104.205f15af.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Source-IP: acsmt358.oracle.com [141.146.40.158] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090207.4AE61F40.024D:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2473 Lines: 79 From: Randy Dunlap When CONFIG_MODULES=n: drivers/net/netxen/netxen_nic_main.c:2751: error: dereferencing pointer to incomplete type drivers/net/netxen/netxen_nic_main.c:2764: error: dereferencing pointer to incomplete type Also needs addition of for sysfs function prototypes or stubs when CONFIG_SYSFS=n. Signed-off-by: Randy Dunlap --- drivers/net/netxen/netxen_nic_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- linux-next-20091026.orig/drivers/net/netxen/netxen_nic_main.c +++ linux-next-20091026/drivers/net/netxen/netxen_nic_main.c @@ -34,6 +34,7 @@ #include #include #include +#include MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); MODULE_LICENSE("GPL"); @@ -2500,6 +2501,7 @@ static struct bin_attribute bin_attr_mem .write = netxen_sysfs_write_mem, }; +#ifdef CONFIG_MODULES static ssize_t netxen_store_auto_fw_reset(struct module_attribute *mattr, struct module *mod, const char *buf, size_t count) @@ -2534,6 +2536,7 @@ static struct module_attribute mod_attr_ .show = netxen_show_auto_fw_reset, .store = netxen_store_auto_fw_reset, }; +#endif static void netxen_create_sysfs_entries(struct netxen_adapter *adapter) @@ -2739,7 +2742,9 @@ static struct pci_driver netxen_driver = static int __init netxen_init_module(void) { +#ifdef CONFIG_MODULES struct module *mod = THIS_MODULE; +#endif printk(KERN_INFO "%s\n", netxen_nic_driver_string); @@ -2748,9 +2753,11 @@ static int __init netxen_init_module(voi register_inetaddr_notifier(&netxen_inetaddr_cb); #endif +#ifdef CONFIG_MODULES if (sysfs_create_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr)) printk(KERN_ERR "%s: Failed to create auto_fw_reset " "sysfs entry.", netxen_nic_driver_name); +#endif return pci_register_driver(&netxen_driver); } @@ -2759,9 +2766,11 @@ module_init(netxen_init_module); static void __exit netxen_exit_module(void) { +#ifdef CONFIG_MODULES struct module *mod = THIS_MODULE; sysfs_remove_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr); +#endif pci_unregister_driver(&netxen_driver); -- 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/