summaryrefslogtreecommitdiff
path: root/net/mac80211/debugfs.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-05-25 10:38:26 +0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-25 10:38:26 +0400
commitb1e50ebcf24668e57f058deb48b0704b5391ed0f (patch)
tree17e1b69b249d0738317b732186340c9dd053f1a1 /net/mac80211/debugfs.h
parent0c2a2ae32793e3500a15a449612485f5d17dd431 (diff)
parent7e125f7b9cbfce4101191b8076d606c517a73066 (diff)
downloadlinux-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.xz
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'net/mac80211/debugfs.h')
-rw-r--r--net/mac80211/debugfs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/debugfs.h b/net/mac80211/debugfs.h
index 68e6a2050f9a..09cc9be34796 100644
--- a/net/mac80211/debugfs.h
+++ b/net/mac80211/debugfs.h
@@ -7,7 +7,6 @@ extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
#else
static inline void debugfs_hw_add(struct ieee80211_local *local)
{
- return;
}
#endif