From c05d6b2efc883b8e2131595a479703489addae12 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 16:33:36 +0200 Subject: [GCC4] fix build error in include/net/irda/qos.h This patch fixes this error with gcc 4 : actisys.c:65: error: static declaration of 'baud_rates' follows non-static declaration /usr/src/git/linux-2.4/include/net/irda/qos.h:86: error: previous declaration of 'baud_rates' was here --- include/net/irda/qos.h | 1 - net/irda/qos.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h index fd6e2de..ee7edb2 100644 --- a/include/net/irda/qos.h +++ b/include/net/irda/qos.h @@ -83,7 +83,6 @@ struct qos_info { extern int sysctl_max_baud_rate; extern int sysctl_max_inactive_time; -extern __u32 baud_rates[]; extern __u32 data_sizes[]; extern __u32 min_turn_times[]; extern __u32 add_bofs[]; diff --git a/net/irda/qos.c b/net/irda/qos.c index 97b8041..11d5e7b 100644 --- a/net/irda/qos.c +++ b/net/irda/qos.c @@ -97,7 +97,7 @@ static int irlap_param_min_turn_time(voi int get); __u32 min_turn_times[] = { 10000, 5000, 1000, 500, 100, 50, 10, 0 }; /* us */ -__u32 baud_rates[] = { 2400, 9600, 19200, 38400, 57600, 115200, 576000, +static __u32 baud_rates[] = { 2400, 9600, 19200, 38400, 57600, 115200, 576000, 1152000, 4000000, 16000000 }; /* bps */ __u32 data_sizes[] = { 64, 128, 256, 512, 1024, 2048 }; /* bytes */ __u32 add_bofs[] = { 48, 24, 12, 5, 3, 2, 1, 0 }; /* bytes */ -- 1.4.2