Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c
index b1aec3e1892f..9c70b5fa3f51 100644
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
@@ -119,6 +119,7 @@ const struct file_operations i2400m_rx_stats_fops = {
         .open =         i2400m_stats_open,
         .read =         i2400m_rx_stats_read,
         .write =        i2400m_rx_stats_write,
+        .llseek =       default_llseek,
 };
 
 
@@ -171,6 +172,7 @@ const struct file_operations i2400m_tx_stats_fops = {
         .open =         i2400m_stats_open,
         .read =         i2400m_tx_stats_read,
         .write =        i2400m_tx_stats_write,
+        .llseek =       default_llseek,
 };