path: root/net/irda/irsysctl.c
diff options
authorAndi Kleen <ak@linux.intel.com>2011-09-16 09:09:50 +0000
committerDavid S. Miller <davem@davemloft.net>2011-09-16 19:17:09 -0400
commit9566042ef84fd2a282d00d3163074ec9b3f93a70 (patch)
treeaebab15b78e7024967f12979ecdd40539a6a7094 /net/irda/irsysctl.c
parentaa1c366e4febc7f5c2b84958a2dd7cd70e28f9d0 (diff)
IRDA: Fix global type conflicts in net/irda/irsysctl.c v2
The externs here didn't agree with the declarations in qos.c. Better would be probably to move this into a header, but since it's common practice to have naked externs with sysctls I left it for now. Cc: samuel@sortiz.org Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irsysctl.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index d0b70dadf73..2615ffc8e78 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -40,9 +40,9 @@ extern int sysctl_slot_timeout;
extern int sysctl_fast_poll_increase;
extern char sysctl_devname[];
extern int sysctl_max_baud_rate;
-extern int sysctl_min_tx_turn_time;
-extern int sysctl_max_tx_data_size;
-extern int sysctl_max_tx_window;
+extern unsigned int sysctl_min_tx_turn_time;
+extern unsigned int sysctl_max_tx_data_size;
+extern unsigned int sysctl_max_tx_window;
extern int sysctl_max_noreply_time;
extern int sysctl_warn_noreply_time;
extern int sysctl_lap_keepalive_time;