From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 06:43:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D728569; Fri, 17 Jan 2014 06:43:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A63D13C9; Fri, 17 Jan 2014 06:43:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0H6havF028790; Fri, 17 Jan 2014 06:43:36 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0H6haUf028789; Fri, 17 Jan 2014 06:43:36 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401170643.s0H6haUf028789@svn.freebsd.org> From: Justin Hibbits Date: Fri, 17 Jan 2014 06:43:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260807 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 06:43:36 -0000 Author: jhibbits Date: Fri Jan 17 06:43:35 2014 New Revision: 260807 URL: http://svnweb.freebsd.org/changeset/base/260807 Log: Fix a mis-merge, and remove an unnecessary initialization. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Fri Jan 17 05:26:55 2014 (r260806) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Fri Jan 17 06:43:35 2014 (r260807) @@ -431,10 +431,6 @@ pmu_attach(device_t dev) "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, pmu_sleep, "I", "Put the machine to sleep"); - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, - "sleep", CTLTYPE_INT | CTLFLAG_RW, sc, 0, - pmu_sleep, "I", "Put the machine to sleep"); - if (sc->sc_batteries > 0) { struct sysctl_oid *oid, *battroot; char battnum[2]; @@ -492,7 +488,6 @@ pmu_attach(device_t dev) } } - sc->lid_closed = 0; /* * Set up LED interface */