summaryrefslogtreecommitdiff
path: root/sys/dev/ic/comvar.h
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2008-01-20 18:09:03 +0000
committerjoerg <joerg@NetBSD.org>2008-01-20 18:09:03 +0000
commit3615cf77159918b7f0f329fe9bd331e3ebdced7d (patch)
tree22973ad9165e64bd43f42f088fc6f91ebe013a06 /sys/dev/ic/comvar.h
parenteb444c6f8554c82b259e7c89caa6aa6b2f24aac7 (diff)
Now that __HAVE_TIMECOUNTER and __HAVE_GENERIC_TODR are invariants,
remove the conditionals and the code associated with the undef case.
Diffstat (limited to 'sys/dev/ic/comvar.h')
-rw-r--r--sys/dev/ic/comvar.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
index f959edfbc19..5c617bce852 100644
--- a/sys/dev/ic/comvar.h
+++ b/sys/dev/ic/comvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.58 2007/12/14 03:36:55 dyoung Exp $ */
+/* $NetBSD: comvar.h,v 1.59 2008/01/20 18:09:11 joerg Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -206,16 +206,7 @@ struct com_softc {
void (*disable)(struct com_softc *);
int enabled;
-#ifdef __HAVE_TIMECOUNTER
struct pps_state sc_pps_state; /* pps state */
-#else /* !__HAVE_TIMECOUNTER */
- /* PPS signal on DCD, with or without inkernel clock disciplining */
- u_char sc_ppsmask; /* pps signal mask */
- u_char sc_ppsassert; /* pps leading edge */
- u_char sc_ppsclear; /* pps trailing edge */
- pps_info_t ppsinfo;
- pps_params_t ppsparam;
-#endif /* !__HAVE_TIMECOUNTER */
#if NRND > 0 && defined(RND_COM)
rndsource_element_t rnd_source;