CVS commit: src/sys/arch/arm

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Wed Aug 19 15:01:07 UTC 2009

Modified Files:
        src/sys/arch/arm/footbridge/isa: isa_machdep.c
        src/sys/arch/arm/include: isa_machdep.h

Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/footbridge/isa/isa_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/isa_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.14 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.15
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.14	Tue Aug 18 17:02:00 2009
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c	Wed Aug 19 15:01:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $");
 
 #include "opt_irqstats.h"
 
@@ -501,7 +501,7 @@
 }
 
 void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
 {
 #if NISADMA > 0
 	isa_dma_destroy();

Index: src/sys/arch/arm/include/isa_machdep.h
diff -u src/sys/arch/arm/include/isa_machdep.h:1.6 src/sys/arch/arm/include/isa_machdep.h:1.7
--- src/sys/arch/arm/include/isa_machdep.h:1.6	Wed Aug 19 14:35:45 2009
+++ src/sys/arch/arm/include/isa_machdep.h	Wed Aug 19 15:01:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:35:45 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:07 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 void	isa_attach_hook(struct device *, struct device *,
 	    struct isabus_attach_args *);
-void	isa_detach_hook(device_t);
+void	isa_detach_hook(isa_chipset_tag_t, device_t);
 const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
 	    int level, int (*ih_fun)(void *), void *ih_arg);