diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 14:17:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 14:17:24 -0500 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /net/wireless/debugfs.h | |
| parent | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (diff) | |
| parent | bcb628d579a61d0ab0cac4c6cc8a403de5254920 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/debugfs.h')
| -rw-r--r-- | net/wireless/debugfs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/wireless/debugfs.h b/net/wireless/debugfs.h index 6419b6d6ce3e..74fdd3811427 100644 --- a/net/wireless/debugfs.h +++ b/net/wireless/debugfs.h | |||
| @@ -3,12 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef CONFIG_CFG80211_DEBUGFS | 4 | #ifdef CONFIG_CFG80211_DEBUGFS |
| 5 | void cfg80211_debugfs_rdev_add(struct cfg80211_registered_device *rdev); | 5 | void cfg80211_debugfs_rdev_add(struct cfg80211_registered_device *rdev); |
| 6 | void cfg80211_debugfs_rdev_del(struct cfg80211_registered_device *rdev); | ||
| 7 | #else | 6 | #else |
| 8 | static inline | 7 | static inline |
| 9 | void cfg80211_debugfs_rdev_add(struct cfg80211_registered_device *rdev) {} | 8 | void cfg80211_debugfs_rdev_add(struct cfg80211_registered_device *rdev) {} |
| 10 | static inline | ||
| 11 | void cfg80211_debugfs_rdev_del(struct cfg80211_registered_device *rdev) {} | ||
| 12 | #endif | 9 | #endif |
| 13 | 10 | ||
| 14 | #endif /* __CFG80211_DEBUGFS_H */ | 11 | #endif /* __CFG80211_DEBUGFS_H */ |