dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

netxen: fix builds for SYSFS=n or MODULES=n 

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 <linux/sysfs.h> for sysfs function prototypes or
stubs when CONFIG_SYSFS=n.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Randy Dunlap 2009-10-26 12:09:45 +00:00 committed by David S. Miller
parent eef6dd65e3
commit 0531d7b851
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/netxen/netxen_nic_main.c
View File

@ -34,6 +34,7 @@
#include <net/ip.h>
#include <linux/ipv6.h>
#include <linux/inetdevice.h>
#include <linux/sysfs.h>
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_fw_reset = {
.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(void)
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);