Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
index ae75d4178739..ff5c380f3c13 100644
--- a/net/mac80211/rc80211_pid_debugfs.c
+++ b/net/mac80211/rc80211_pid_debugfs.c
@@ -85,7 +85,7 @@ static int rate_control_pid_events_open(struct inode *inode, struct file *file)
         struct rc_pid_sta_info *sinfo = inode->i_private;
         struct rc_pid_event_buffer *events = &sinfo->events;
         struct rc_pid_events_file_info *file_info;
-        unsigned int status;
+        unsigned long status;
 
         /* Allocate a state struct */
         file_info = kmalloc(sizeof(*file_info), GFP_KERNEL);
@@ -135,7 +135,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
         char pb[RC_PID_PRINT_BUF_SIZE];
         int ret;
         int p;
-        unsigned int status;
+        unsigned long status;
 
         /* Check if there is something to read. */
         if (events->next_entry == file_info->next_entry) {