diff options
author | David S. Miller <davem@davemloft.net> | 2010-09-21 21:17:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-21 21:17:19 -0400 |
commit | a0741ca949692904646c310573754859cba09bf1 (patch) | |
tree | fc95067d8bfee5f6c6c747c74d1d6547d70199a3 /drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | |
parent | 9e2e8f14d48dbb6c31aeb739ae4fc8997b9dfe84 (diff) | |
parent | b618f6f885579a6237e5bf4582fa6167972ddef4 (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h index bbdce5913ac..f2573b5486c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | |||
@@ -39,6 +39,8 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf, | |||
39 | size_t count, loff_t *ppos); | 39 | size_t count, loff_t *ppos); |
40 | ssize_t iwl_ucode_bt_stats_read(struct file *file, char __user *user_buf, | 40 | ssize_t iwl_ucode_bt_stats_read(struct file *file, char __user *user_buf, |
41 | size_t count, loff_t *ppos); | 41 | size_t count, loff_t *ppos); |
42 | ssize_t iwl_reply_tx_error_read(struct file *file, char __user *user_buf, | ||
43 | size_t count, loff_t *ppos); | ||
42 | #else | 44 | #else |
43 | static ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf, | 45 | static ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf, |
44 | size_t count, loff_t *ppos) | 46 | size_t count, loff_t *ppos) |
@@ -60,4 +62,9 @@ static ssize_t iwl_ucode_bt_stats_read(struct file *file, char __user *user_buf, | |||
60 | { | 62 | { |
61 | return 0; | 63 | return 0; |
62 | } | 64 | } |
65 | static ssize_t iwl_reply_tx_error_read(struct file *file, char __user *user_buf, | ||
66 | size_t count, loff_t *ppos) | ||
67 | { | ||
68 | return 0; | ||
69 | } | ||
63 | #endif | 70 | #endif |