From c2b2965b6a50e898bcf71ca5c930dbc79366049d Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 9 Jan 2006 06:05:57 +0000 Subject: [PATCH] By popular demand, move __HAVE_ACPI and __PCI_REROUTE_INTERRUPT into param.h. Per request, I've placed these just after the _NO_NAMESPACE_POLLUTION ifndef. I've not renamed anything yet, but may since we don't need the __. Submitted by: bde, jhb, scottl, many others. --- sys/alpha/include/_types.h | 2 -- sys/alpha/include/param.h | 2 ++ sys/amd64/include/_types.h | 2 -- sys/amd64/include/param.h | 3 +++ sys/arm/include/_types.h | 2 -- sys/arm/include/param.h | 2 ++ sys/i386/include/_types.h | 2 -- sys/i386/include/param.h | 3 +++ sys/ia64/include/_types.h | 3 --- sys/ia64/include/param.h | 3 +++ sys/pc98/include/_types.h | 2 -- sys/pc98/include/param.h | 2 ++ 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sys/alpha/include/_types.h b/sys/alpha/include/_types.h index 88ae6e539fc8..a8acbbbce351 100644 --- a/sys/alpha/include/_types.h +++ b/sys/alpha/include/_types.h @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h index f8e1a45da895..56c5a844970f 100644 --- a/sys/alpha/include/param.h +++ b/sys/alpha/include/param.h @@ -66,6 +66,8 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h index d129b217fb60..4217c82b060b 100644 --- a/sys/amd64/include/_types.h +++ b/sys/amd64/include/_types.h @@ -44,8 +44,6 @@ #endif #define __NO_STRICT_ALIGNMENT -#define __HAVE_ACPI -#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 11cd97712efb..b1b90f467658 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -66,6 +66,9 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 8775b9622a5d..c700f523caf1 100644 --- a/sys/arm/include/_types.h +++ b/sys/arm/include/_types.h @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index 65c4f4aae6f6..4c59eee53c6d 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -59,6 +59,8 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h index 1238183ab92a..b272cf0f3f8f 100644 --- a/sys/i386/include/_types.h +++ b/sys/i386/include/_types.h @@ -44,8 +44,6 @@ #endif #define __NO_STRICT_ALIGNMENT -#define __HAVE_ACPI -#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 633d164b53ea..0f67c271a7a1 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -51,6 +51,9 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h index 5143ad492923..8fc1be2f3873 100644 --- a/sys/ia64/include/_types.h +++ b/sys/ia64/include/_types.h @@ -43,9 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __HAVE_ACPI -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h index 233bc47a7076..c71c6e5a7bf3 100644 --- a/sys/ia64/include/param.h +++ b/sys/ia64/include/param.h @@ -65,6 +65,9 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ diff --git a/sys/pc98/include/_types.h b/sys/pc98/include/_types.h index b5ff4b15732b..63da67a982a2 100644 --- a/sys/pc98/include/_types.h +++ b/sys/pc98/include/_types.h @@ -4,5 +4,3 @@ /* $FreeBSD$ */ #include - -#undef __HAVE_ACPI diff --git a/sys/pc98/include/param.h b/sys/pc98/include/param.h index 51803b246534..2e44cf22cc5b 100644 --- a/sys/pc98/include/param.h +++ b/sys/pc98/include/param.h @@ -29,3 +29,5 @@ #define MACHINE "pc98" #include + +#undef __HAVE_ACPI