From owner-cvs-src@FreeBSD.ORG  Wed Mar  1 18:19:33 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D82CD16A420;
	Wed,  1 Mar 2006 18:19:33 +0000 (GMT) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A52C243D46;
	Wed,  1 Mar 2006 18:19:33 +0000 (GMT) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k21IJXx8056373;
	Wed, 1 Mar 2006 18:19:33 GMT (envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21IJXCu056372;
	Wed, 1 Mar 2006 18:19:33 GMT (envelope-from imp)
Message-Id: <200603011819.k21IJXCu056372@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 1 Mar 2006 18:19:33 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/conf files src/sys/dev/cardbus cardbus.c
 cardbus_cis.c cardbusreg.h cardbusvar.h src/sys/modules/cardbus
 Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Mar 2006 18:19:34 -0000

imp         2006-03-01 18:19:33 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/conf             files 
    sys/dev/cardbus      cardbus.c cardbus_cis.c cardbusreg.h 
                         cardbusvar.h 
    sys/modules/cardbus  Makefile 
  Log:
  Back out latest cardbus MFC.  This breaks stuff in a lot of weird and
  unknown ways.  Until that breakage is sorted out, be conservative.  I'm
  not backing this out in current so I can track down the issues.
  
  I'm also not backing out the pci parts of this commit because with the
  old cardbus code they work perfectly as far as I've been able to test.
  I'm leaving cardbus_device.c in place as well since I anticipate being
  able to reconnect it when I resolve this issue in head and cvs rm +
  cvs add on branches can be a pita...
  
  Approved by: re@ (scottl)
  
  Revision     Changes    Path
  1.1031.2.23  +1 -1      src/sys/conf/files
  1.52.2.3     +359 -54   src/sys/dev/cardbus/cardbus.c
  1.50.2.2     +140 -80   src/sys/dev/cardbus/cardbus_cis.c
  1.8.2.2      +37 -0     src/sys/dev/cardbus/cardbusreg.h
  1.11.2.2     +2 -34     src/sys/dev/cardbus/cardbusvar.h
  1.10.14.2    +1 -1      src/sys/modules/cardbus/Makefile