Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...

diff --cc drivers/net/wireless/bcm43xx/bcm43xx.h
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
Simple merge

diff --cc net/core/net-sysfs.c
index 44db095a8f7e9f4e404f616c4837edc019408060,44e69a21c32aed5f03b6029bca3af15b105a926b..cd59ac6200926bc6239e9242af3ab737ac40c353
--- 1/net/core/net-sysfs.c
--- 2/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 *))
  {