diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-07 02:29:31 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-07 02:29:31 +0000 |
| commit | d611c626dcfedc32389bf4cef66844f3bbe7f411 (patch) | |
| tree | 1efb403cf0c67e581b8516f82d3913eb7a47b427 /sys/arch | |
| parent | 525b8b85bcee548192ba13483c300604e68c6fbd (diff) | |
CCITT about to bite the dust, remove special casing in archs and drivers
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/dev/if_mc.c | 10 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c index f200525f1c8..ddf91a6ab6e 100644 --- a/sys/arch/mac68k/dev/if_mc.c +++ b/sys/arch/mac68k/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.11 2005/01/04 18:42:04 martin Exp $ */ +/* $OpenBSD: if_mc.c,v 1.12 2005/06/07 02:29:30 henning Exp $ */ /* $NetBSD: if_mc.c,v 1.24 2004/10/30 18:08:34 thorpej Exp $ */ /*- @@ -62,14 +62,6 @@ #include <netns/ns_if.h> #endif -#if defined(CCITT) && defined(LLC) -#include <sys/socketvar.h> -#include <netccitt/x25.h> -#include <netccitt/pk.h> -#include <netccitt/pk_var.h> -#include <netccitt/pk_extern.h> -#endif - #include <uvm/uvm_extern.h> #include "bpfilter.h" diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index bbd56eccfef..9ec488eb381 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.14 2005/05/30 12:51:13 art Exp $ */ +/* $OpenBSD: interrupt.c,v 1.15 2005/06/07 02:29:30 henning Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -205,7 +205,7 @@ printf("Unhandled interrupt %x:%x\n", cause, pending); softclock(); } #if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || defined(CCITT) || NATM > 0 || \ + defined(IPX) || defined(NS) || NATM > 0 || \ NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~xcpl) { extern int netisr; @@ -514,7 +514,7 @@ generic_do_pending_int(int newcpl) softclock(); } #if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || defined(CCITT) || NATM > 0 || \ + defined(IPX) || defined(NS) || NATM > 0 || \ NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~newcpl) { int isr = netisr; |