fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / irda / irsysctl.c

diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 995f4e1..86805c3 100644 (file)
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -23,7 +23,6 @@
  *     
  ********************************************************************/
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/ctype.h>
 #include <linux/sysctl.h>
@@ -43,7 +42,6 @@ extern int  sysctl_discovery_slots;
 extern int  sysctl_discovery_timeout;
 extern int  sysctl_slot_timeout;
 extern int  sysctl_fast_poll_increase;
-int         sysctl_compression = 0;
 extern char sysctl_devname[];
 extern int  sysctl_max_baud_rate;
 extern int  sysctl_min_tx_turn_time;
@@ -78,11 +76,11 @@ static int min_lap_keepalive_time = 100;    /* 100us */
  * us on that - Jean II */
 
 static int do_devname(ctl_table *table, int write, struct file *filp,
-                     void __user *buffer, size_t *lenp)
+                     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
        int ret;
 
-       ret = proc_dostring(table, write, filp, buffer, lenp);
+       ret = proc_dostring(table, write, filp, buffer, lenp, ppos);
        if (ret == 0 && write) {
                struct ias_value *val;