PERFORCE change 53640 for review
Marcel Moolenaar
marcel at FreeBSD.org
Thu May 27 20:14:35 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=53640
Change 53640 by marcel at marcel_nfs on 2004/05/27 20:13:34
IFC @53638
Affected files ...
.. //depot/projects/gdb/sys/dev/acpica/acpi.c#17 integrate
.. //depot/projects/gdb/sys/dev/pccard/card_if.m#2 integrate
.. //depot/projects/gdb/sys/dev/pccard/pccardvar.h#2 integrate
.. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#4 integrate
Differences ...
==== //depot/projects/gdb/sys/dev/acpica/acpi.c#17 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.147 2004/05/27 18:38:45 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.148 2004/05/28 02:50:43 marcel Exp $
*/
#include "opt_acpi.h"
@@ -1877,7 +1877,7 @@
if (acpi_parse_prw(h, &prw) != 0)
return (AE_OK);
- sstate = (int)context;
+ sstate = (int)(intptr_t)context;
if (sstate > prw.lowest_wake)
AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR);
@@ -1892,7 +1892,7 @@
if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle)))
AcpiWalkNamespace(ACPI_TYPE_ANY, sb_handle, 100,
- acpi_wake_limit, (void *)sstate, NULL);
+ acpi_wake_limit, (void *)(intptr_t)sstate, NULL);
return (0);
}
==== //depot/projects/gdb/sys/dev/pccard/card_if.m#2 (text+ko) ====
@@ -23,10 +23,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.23 2003/10/07 03:33:53 imp Exp $
+# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.24 2004/05/28 02:23:10 imp Exp $
#
#include <sys/bus.h>
+#include <machine/bus.h>
#include <dev/pccard/pccardvar.h>
INTERFACE card;
==== //depot/projects/gdb/sys/dev/pccard/pccardvar.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */
-/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.46 2003/11/02 20:18:19 imp Exp $ */
+/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.47 2004/05/28 02:24:07 imp Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,11 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <machine/bus.h>
-
extern int pccard_verbose;
/*
==== //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.23 2004/05/27 03:49:43 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.24 2004/05/28 02:19:42 imp Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -42,6 +42,8 @@
#include <net/if.h>
#include <net/if_arp.h>
+#include <machine/bus.h>
+
#include <dev/pccard/pccardvar.h>
#include <dev/sn/if_snvar.h>
More information about the p4-projects
mailing list