/[linux-patches]/genpatches-2.6/trunk/2.6.16/1022_linux-2.6.16.23.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.16/1022_linux-2.6.16.23.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 508 - (show annotations) (download) (as text)
Fri Jun 30 22:11:00 2006 UTC (14 years, 4 months ago) by dsd
File MIME type: text/x-diff
File size: 1340 byte(s)
remove merged patch
1 diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
2 index 6c8452e..f63c387 100644
3 --- a/drivers/parport/Kconfig
4 +++ b/drivers/parport/Kconfig
5 @@ -48,7 +48,7 @@ config PARPORT_PC
6
7 config PARPORT_SERIAL
8 tristate "Multi-IO cards (parallel and serial)"
9 - depends on SERIAL_8250_PCI && PARPORT_PC && PCI
10 + depends on SERIAL_8250 && PARPORT_PC && PCI
11 help
12 This adds support for multi-IO PCI cards that have parallel and
13 serial ports. You should say Y or M here. If you say M, the module
14 diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
15 index df67679..b82be93 100644
16 --- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
17 +++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
18 @@ -254,7 +254,7 @@ static int do_basic_checks(struct ip_con
19 }
20
21 DEBUGP("Basic checks passed\n");
22 - return 0;
23 + return count == 0;
24 }
25
26 static int new_state(enum ip_conntrack_dir dir,
27 diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
28 index cd2326d..7fcd1dd 100644
29 --- a/net/netfilter/nf_conntrack_proto_sctp.c
30 +++ b/net/netfilter/nf_conntrack_proto_sctp.c
31 @@ -259,7 +259,7 @@ static int do_basic_checks(struct nf_con
32 }
33
34 DEBUGP("Basic checks passed\n");
35 - return 0;
36 + return count == 0;
37 }
38
39 static int new_state(enum ip_conntrack_dir dir,

  ViewVC Help
Powered by ViewVC 1.1.20