Index: head/sys/arm/conf/PANDABOARD
===================================================================
--- head/sys/arm/conf/PANDABOARD
+++ head/sys/arm/conf/PANDABOARD
@@ -30,6 +30,8 @@
 include 	"std.armv6"
 include 	"../ti/omap4/pandaboard/std.pandaboard"
 
+options		ARM_INTRNG		# new interrupt framework
+
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM
Index: head/sys/arm/ti/omap4/std.omap4
===================================================================
--- head/sys/arm/ti/omap4/std.omap4
+++ head/sys/arm/ti/omap4/std.omap4
@@ -17,7 +17,3 @@
 options		SOC_OMAP4
 
 options		ARM_L2_PIPT
-
-options		IPI_IRQ_START=0
-options		IPI_IRQ_END=15
-
Index: head/sys/arm/ti/ti_common.c
===================================================================
--- head/sys/arm/ti/ti_common.c
+++ head/sys/arm/ti/ti_common.c
@@ -70,7 +70,7 @@
 #endif
 
 fdt_pic_decode_t fdt_pic_table[] = {
-#ifdef SOC_OMAP4
+#if defined(SOC_OMAP4) && !defined(ARM_INTRNG)
 	&gic_decode_fdt,
 #endif
 #ifdef SOC_TI_AM335X