diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 03:40:34 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 03:40:34 (GMT) |
| commit | fc943b12e48f9341bce48c2fadf094cc721aab93 (patch) | |
| tree | 8c3244d7f5fae4edbfe0a5103789b0bc5c64f478 /net/core/net-sysfs.c | |
| parent | 72d9794f444734af56ef12833b496326643e2964 (diff) | |
| parent | 4c9adafff7d910f142fe44fae37ed12c6b99f20f (diff) | |
| download | linux-fsl-qoriq-fc943b12e48f9341bce48c2fadf094cc721aab93.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/core/net-sysfs.c')
| -rw-r--r-- | net/core/net-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 3f79413..c1f4e0d 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -318,7 +318,7 @@ static struct attribute_group netstat_group = { .attrs = netstat_attrs, }; -#ifdef CONFIG_WIRELESS_EXT +#ifdef CONFIG_WIRELESS_EXT_SYSFS /* helper function that does all the locking etc for wireless stats */ static ssize_t wireless_show(struct device *d, char *buf, ssize_t (*format)(const struct iw_statistics *, @@ -459,7 +459,7 @@ int netdev_register_kobject(struct net_device *net) #ifdef CONFIG_SYSFS *groups++ = &netstat_group; -#ifdef CONFIG_WIRELESS_EXT +#ifdef CONFIG_WIRELESS_EXT_SYSFS if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats) *groups++ = &wireless_group; #endif |