diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 16:45:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 16:45:16 -0400 |
| commit | 4722cd7741c6404f967f7a7b8b666540b6c1663e (patch) | |
| tree | 877b7d8efe1e4e4ce48416186b4f45da3a5fccac /include | |
| parent | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (diff) | |
| parent | 4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index d17f47fc9e31..408ae4882d22 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -1865,6 +1865,9 @@ struct wiphy { | |||
| 1865 | * you need use set_wiphy_dev() (see below) */ | 1865 | * you need use set_wiphy_dev() (see below) */ |
| 1866 | struct device dev; | 1866 | struct device dev; |
| 1867 | 1867 | ||
| 1868 | /* protects ->resume, ->suspend sysfs callbacks against unregister hw */ | ||
| 1869 | bool registered; | ||
| 1870 | |||
| 1868 | /* dir in debugfs: ieee80211/<wiphyname> */ | 1871 | /* dir in debugfs: ieee80211/<wiphyname> */ |
| 1869 | struct dentry *debugfsdir; | 1872 | struct dentry *debugfsdir; |
| 1870 | 1873 | ||