From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- net/ipv4/protocol.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'net/ipv4/protocol.c') diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index 4839764e8..db57fedb9 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c @@ -112,10 +112,7 @@ static struct inet_protocol icmp_protocol = struct inet_protocol *inet_protocol_base = IPPROTO_PREVIOUS; -struct inet_protocol *inet_protos[MAX_INET_PROTOS] = -{ - NULL -}; +struct inet_protocol *inet_protos[MAX_INET_PROTOS]; /* * Add a protocol handler to the hash tables -- cgit v1.2.3