Rename ARM_INTRNG and MIPS_INTRNG to INTRNG. This will help with machine

independent code that needs to know about INTRNG such as PCI drivers.

Obtained from:	ABT Systems Ltd
Sponsored by:	The FreeBSD Foundation

16 files changed, 16 insertions, 16 deletions

diff --git a/sys/arm/conf/A20 b/sys/arm/conf/A20
index 8f56523..f28080c 100644
--- a/sys/arm/conf/A20
+++ b/sys/arm/conf/A20
@@ -23,7 +23,7 @@ ident		A20
 include 	"std.armv6"
 include 	"../allwinner/a20/std.a20"
 
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	SOC_ALLWINNER_A20
 
diff --git a/sys/arm/conf/ALPINE b/sys/arm/conf/ALPINE
index fa30865..55e4468d3 100644
--- a/sys/arm/conf/ALPINE
+++ b/sys/arm/conf/ALPINE
@@ -37,7 +37,7 @@ options 	DDB			#Enable the kernel debugger
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # Pseudo devices
 device		loop
diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X
index 13c3aa2..1903e62 100644
--- a/sys/arm/conf/ARMADA38X
+++ b/sys/arm/conf/ARMADA38X
@@ -62,7 +62,7 @@ device		pci
 
 # Interrupt controllers
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # Timers
 device		mpcore_timer
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 1885c0c..4497b0ff 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -28,7 +28,7 @@ include 	"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"
 
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index 770a690..c997916 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -87,7 +87,7 @@ device		dwmmc
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM Generic Timer
 device		generic_timer
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 6b383e2..bc1145f 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -22,7 +22,7 @@ ident		IMX6
 include 	"std.armv6"
 include 	"../freescale/imx/std.imx6"
 
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	SOC_IMX6
 
diff --git a/sys/arm/conf/ODROIDC1 b/sys/arm/conf/ODROIDC1
index 550da87..16802d3 100644
--- a/sys/arm/conf/ODROIDC1
+++ b/sys/arm/conf/ODROIDC1
@@ -26,7 +26,7 @@ options 	SMP			# Enable multiple cores
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=odroidc1.dts
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index 4eaa471..69a8252 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -60,7 +60,7 @@ options 	DDB			# Enable the kernel debugger
 device		fdt_pinctrl
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188
index ec6ddb8..e3e5ac8 100644
--- a/sys/arm/conf/RK3188
+++ b/sys/arm/conf/RK3188
@@ -47,7 +47,7 @@ options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0\"
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 9bc2636..5f6bc27 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -24,7 +24,7 @@ include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2835"
 
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2
index 3cee50d..e669580 100644
--- a/sys/arm/conf/RPI2
+++ b/sys/arm/conf/RPI2
@@ -24,7 +24,7 @@ include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"
 
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common
index 3365929..3db9457 100644
--- a/sys/arm/conf/SOCKIT.common
+++ b/sys/arm/conf/SOCKIT.common
@@ -53,7 +53,7 @@ options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, require
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT
index aabe636..374af87 100644
--- a/sys/arm/conf/VIRT
+++ b/sys/arm/conf/VIRT
@@ -47,7 +47,7 @@ options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, require
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM Generic Timer
 device		generic_timer
diff --git a/sys/arm/conf/VSATV102 b/sys/arm/conf/VSATV102
index 96e3ba4..c08060a 100644
--- a/sys/arm/conf/VSATV102
+++ b/sys/arm/conf/VSATV102
@@ -26,7 +26,7 @@ options 	SMP			# Enable multiple cores
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=vsatv102-m6.dts
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index 471b8d5..3e15e42 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -62,7 +62,7 @@ options 	NO_SWAPPING
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 41ec23a..1c024cc 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -52,7 +52,7 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
-options 	ARM_INTRNG
+options 	INTRNG
 
 # Cache controller
 device		pl310			# PL310 L2 cache controller