From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 9 Feb 2007 21:12:09 +0000 (-0500)
Subject: Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.21-rc1~74^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3cc2de9138f1ee1581f55927f33f7d72ed6207d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'upstream' of /linux/kernel/git/linville/wireless-2.6 into upstream
---

a3cc2de9138f1ee1581f55927f33f7d72ed6207d
diff --cc net/core/net-sysfs.c
index 44db095,44e69a21..cd59ac6
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@@ -340,9 -329,9 +340,9 @@@ static struct attribute_group netstat_g
  	.attrs  = netstat_attrs,
  };
  
- #ifdef WIRELESS_EXT
+ #ifdef CONFIG_WIRELESS_EXT
  /* helper function that does all the locking etc for wireless stats */
 -static ssize_t wireless_show(struct class_device *cd, char *buf,
 +static ssize_t wireless_show(struct device *d, char *buf,
  			     ssize_t (*format)(const struct iw_statistics *,
  					       char *))
  {