From owner-svn-src-stable@FreeBSD.ORG Mon Dec 21 06:24:45 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED3C91065672; Mon, 21 Dec 2009 06:24:44 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DB03E8FC17; Mon, 21 Dec 2009 06:24:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBL6OiLw086124; Mon, 21 Dec 2009 06:24:44 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBL6OiR9086118; Mon, 21 Dec 2009 06:24:44 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200912210624.nBL6OiR9086118@svn.freebsd.org> From: Andriy Gapon Date: Mon, 21 Dec 2009 06:24:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200766 - in stable/7/sys: amd64/conf conf dev/amdsbwd i386/conf modules modules/amdsbwd X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 06:24:45 -0000 Author: avg Date: Mon Dec 21 06:24:44 2009 New Revision: 200766 URL: http://svn.freebsd.org/changeset/base/200766 Log: MFC r199969: amdsbwd: new driver for AMD SB600/SB7xx watchdog timer Added: stable/7/sys/dev/amdsbwd/ - copied from r199969, head/sys/dev/amdsbwd/ stable/7/sys/modules/amdsbwd/ - copied from r199969, head/sys/modules/amdsbwd/ Modified: stable/7/sys/amd64/conf/NOTES stable/7/sys/conf/files.amd64 stable/7/sys/conf/files.i386 stable/7/sys/i386/conf/NOTES stable/7/sys/modules/Makefile Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/amd64/conf/NOTES ============================================================================== --- stable/7/sys/amd64/conf/NOTES Mon Dec 21 05:58:55 2009 (r200765) +++ stable/7/sys/amd64/conf/NOTES Mon Dec 21 06:24:44 2009 (r200766) @@ -449,8 +449,10 @@ device xrpu # Hardware watchdog timers: # # ichwd: Intel ICH watchdog timer +# amdsbwd: AMD SB7xx watchdog timer # device ichwd +device amdsbwd # # Temperature sensors: Modified: stable/7/sys/conf/files.amd64 ============================================================================== --- stable/7/sys/conf/files.amd64 Mon Dec 21 05:58:55 2009 (r200765) +++ stable/7/sys/conf/files.amd64 Mon Dec 21 06:24:44 2009 (r200766) @@ -135,6 +135,7 @@ crypto/via/padlock.c optional padlock crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/acpica/acpi_if.m standard +dev/amdsbwd/amdsbwd.c optional amdsbwd dev/amdtemp/amdtemp.c optional amdtemp dev/arcmsr/arcmsr.c optional arcmsr pci dev/atkbdc/atkbd.c optional atkbd atkbdc Modified: stable/7/sys/conf/files.i386 ============================================================================== --- stable/7/sys/conf/files.i386 Mon Dec 21 05:58:55 2009 (r200765) +++ stable/7/sys/conf/files.i386 Mon Dec 21 06:24:44 2009 (r200766) @@ -131,6 +131,7 @@ crypto/via/padlock_cipher.c optional pad crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa +dev/amdsbwd/amdsbwd.c optional amdsbwd dev/amdtemp/amdtemp.c optional amdtemp dev/arcmsr/arcmsr.c optional arcmsr pci dev/ar/if_ar.c optional ar Modified: stable/7/sys/i386/conf/NOTES ============================================================================== --- stable/7/sys/i386/conf/NOTES Mon Dec 21 05:58:55 2009 (r200765) +++ stable/7/sys/i386/conf/NOTES Mon Dec 21 06:24:44 2009 (r200766) @@ -863,8 +863,10 @@ hint.pcf.0.irq="5" # Hardware watchdog timers: # # ichwd: Intel ICH watchdog timer +# amdsbwd: AMD SB7xx watchdog timer # device ichwd +device amdsbwd # # Temperature sensors: Modified: stable/7/sys/modules/Makefile ============================================================================== --- stable/7/sys/modules/Makefile Mon Dec 21 05:58:55 2009 (r200765) +++ stable/7/sys/modules/Makefile Mon Dec 21 06:24:44 2009 (r200766) @@ -19,6 +19,7 @@ SUBDIR= ${_3dfx} \ alc \ ale \ ${_amd} \ + ${_amdsbwd} \ ${_amdtemp} \ amr \ ${_an} \ @@ -459,6 +460,7 @@ _zfs= zfs _aac= aac _acpi= acpi _ahb= ahb +_amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr _arl= arl @@ -513,6 +515,7 @@ _aac= aac _acpi= acpi _agp= agp _an= an +_amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr _cardbus= cardbus