Remove the unneeded header <machine/intr.h>.

sys/powerpc/aim/clock.c

@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 

sys/powerpc/booke/clock.c

@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/psl.h>
 #include <machine/spr.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
 #include <machine/md_var.h>
 
 /*

sys/powerpc/include/intr.h

@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *	$NetBSD: intr.h,v 1.6 2000/02/11 13:15:44 tsubai Exp $
- * $FreeBSD$
- */
-
-#ifndef _MACPPC_INTR_H_
-#define	_MACPPC_INTR_H_
-
-/* Interrupt priority `levels'. */
-#define	IPL_NONE	9	/* nothing */
-#define	IPL_SOFTCLOCK	8	/* timeouts */
-#define	IPL_SOFTNET	7	/* protocol stacks */
-#define	IPL_BIO		6	/* block I/O */
-#define	IPL_NET		5	/* network */
-#define	IPL_SOFTSERIAL	4	/* serial */
-#define	IPL_TTY		3	/* terminal */
-#define	IPL_IMP		3	/* memory allocation */
-#define	IPL_AUDIO	2	/* audio */
-#define	IPL_CLOCK	1	/* clock */
-#define	IPL_HIGH	1	/* everything */
-#define	IPL_SERIAL	0	/* serial */
-#define	NIPL		10
-
-/* Interrupt sharing types. */
-#define	IST_NONE	0	/* none */
-#define	IST_PULSE	1	/* pulsed */
-#define	IST_EDGE	2	/* edge-triggered */
-#define	IST_LEVEL	3	/* level-triggered */
-
-#ifndef LOCORE
-
-void	do_pending_int(void);
-
-extern u_int cpl, ipending, tickspending;
-extern int imask[];
-
-#define	ICU_LEN		64
-
-/* Soft interrupt masks. */
-#define	SIR_CLOCK	28
-#define	SIR_NET		29
-#define	SIR_SERIAL	30
-#define	SPL_CLOCK	31
-
-#define	CNT_IRQ0	0
-#define	CNT_CLOCK	64
-#define	CNT_SOFTCLOCK	65
-#define	CNT_SOFTNET	66
-#define	CNT_SOFTSERIAL	67
-
-#endif /* !LOCORE */
-
-#endif /* !_MACPPC_INTR_H_ */

sys/powerpc/mpc85xx/atpic.c

@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/ocpbus.h>
 #include <machine/pio.h>

sys/powerpc/mpc85xx/opic.c

@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/openpicvar.h>
 #include <machine/ocpbus.h>

sys/powerpc/powermac/cuda.c

@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>

sys/powerpc/powermac/hrowpic.c

@@ -45,7 +45,6 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>

sys/powerpc/powermac/openpic_macio.c

@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>

sys/powerpc/powermac/pmu.c

@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/led/led.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>

sys/powerpc/powerpc/openpic.c

@@ -35,7 +35,6 @@
 #include <sys/sched.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>

sys/powerpc/psim/openpic_iobus.c

@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>