diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/wireless/reg.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/wireless/reg.h')
| -rw-r--r-- | net/wireless/reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index c4695d07af23..b67d1c3a2fb9 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h | |||
| @@ -8,6 +8,7 @@ bool reg_is_valid_request(const char *alpha2); | |||
| 8 | 8 | ||
| 9 | int regulatory_hint_user(const char *alpha2); | 9 | int regulatory_hint_user(const char *alpha2); |
| 10 | 10 | ||
| 11 | int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env); | ||
| 11 | void reg_device_remove(struct wiphy *wiphy); | 12 | void reg_device_remove(struct wiphy *wiphy); |
| 12 | 13 | ||
| 13 | int __init regulatory_init(void); | 14 | int __init regulatory_init(void); |