svn commit: r209401 - head/sys/x86/isa

[Alexander Motin]

Author: mav
Date: Mon Jun 21 19:53:47 2010
New Revision: 209401
URL: http://svn.freebsd.org/changeset/base/209401

Log:
  Fix i386 LINT build broken by r209371.
  There appeared such legacy thing as APM, that somehow breaking RTC.

Modified:
  head/sys/x86/isa/atrtc.c

Modified: head/sys/x86/isa/atrtc.c
==============================================================================
--- head/sys/x86/isa/atrtc.c	Mon Jun 21 19:44:29 2010	(r209400)
+++ head/sys/x86/isa/atrtc.c	Mon Jun 21 19:53:47 2010	(r209401)
@@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$");
 #define	RTC_LOCK	mtx_lock_spin(&clock_lock)
 #define	RTC_UNLOCK	mtx_unlock_spin(&clock_lock)
 
+int	atrtcclock_disable = 0;
+
 static	int	rtc_reg = -1;
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
 static	u_char	rtc_statusb = RTCSB_24HR;
@@ -267,6 +269,7 @@ atrtc_attach(device_t dev)
 	clock_register(dev, 1000000);
 	bzero(&sc->et, sizeof(struct eventtimer));
 	if (haveirq &&
+	    !atrtcclock_disable &&
 	    (resource_int_value(device_get_name(dev), device_get_unit(dev),
 	     "clock", &i) != 0 || i != 0)) {
 		sc->et.et_name = "RTC";