Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[pandora-kernel.git] / net / mac80211 / rc80211_pid_debugfs.c

diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
index 47438b4..4851e9e 100644 (file)
--- a/net/mac80211/rc80211_pid_debugfs.c
+++ b/net/mac80211/rc80211_pid_debugfs.c
@@ -162,7 +162,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
        file_info->next_entry = (file_info->next_entry + 1) %
                                RC_PID_EVENT_RING_SIZE;
 
-       /* Print information about the event. Note that userpace needs to
+       /* Print information about the event. Note that userspace needs to
         * provide large enough buffers. */
        length = length < RC_PID_PRINT_BUF_SIZE ?
                 length : RC_PID_PRINT_BUF_SIZE;
@@ -206,6 +206,7 @@ static const struct file_operations rc_pid_fop_events = {
        .poll = rate_control_pid_events_poll,
        .open = rate_control_pid_events_open,
        .release = rate_control_pid_events_release,
+       .llseek = noop_llseek,
 };
 
 void rate_control_pid_add_sta_debugfs(void *priv, void *priv_sta,