From owner-svn-src-head@FreeBSD.ORG  Thu Nov 19 18:38:45 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5644E106566B
	for <svn-src-head@freebsd.org>; Thu, 19 Nov 2009 18:38:45 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outP.internet-mail-service.net (outp.internet-mail-service.net
	[216.240.47.239])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D1BF8FC1C
	for <svn-src-head@freebsd.org>; Thu, 19 Nov 2009 18:38:45 +0000 (UTC)
Received: from idiom.com (mx0.idiom.com [216.240.32.160])
	by out.internet-mail-service.net (Postfix) with ESMTP id 595EE14E053;
	Thu, 19 Nov 2009 10:38:44 -0800 (PST)
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org
	(h-67-100-89-137.snfccasy.static.covad.net [67.100.89.137])
	by idiom.com (Postfix) with ESMTP id 500AD2D6018;
	Thu, 19 Nov 2009 10:38:43 -0800 (PST)
Message-ID: <4B0590B2.1010007@elischer.org>
Date: Thu, 19 Nov 2009 10:38:42 -0800
From: Julian Elischer <julian@elischer.org>
User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812)
MIME-Version: 1.0
To: John Baldwin <jhb@FreeBSD.org>
References: <200911191821.nAJILpZ6014634@svn.freebsd.org>
In-Reply-To: <200911191821.nAJILpZ6014634@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r199538 - head/sys/dev/lmc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Nov 2009 18:38:45 -0000

John Baldwin wrote:
> Author: jhb
> Date: Thu Nov 19 18:21:51 2009

> +#  if (__FreeBSD_version >= 500000)
> +  callout_init(&sc->callout, 0);
> +#  else  /* FreeBSD-4 */
> +  callout_init(&sc->callout);
> +#  endif
> +


I think the OpenBSD and _FreeBSD_version >= 500000
conditions can probably be removed..


>  
>  #ifdef __FreeBSD__
> +  struct callout callout;	/* watchdog needs this                  */
>    struct device	*dev;		/* base device pointer                     */
>    bus_space_tag_t csr_tag;	/* bus_space needs this                    */
>    bus_space_handle_t csr_handle;/* bus_space_needs this                    */

along with #ifdef __FreeBSD__