Remove even more unnecessary `needs-flag' attributes from config machinery,

as well as useless include of the generated flag files.

6 files changed, 13 insertions, 14 deletions

diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0
index 096cac76de4..b73d7b71935 100644
--- a/sys/arch/arm/xscale/files.pxa2x0
+++ b/sys/arch/arm/xscale/files.pxa2x0
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pxa2x0,v 1.23 2010/06/07 16:34:20 drahn Exp $
+#	$OpenBSD: files.pxa2x0,v 1.24 2014/10/18 12:21:56 miod Exp $
 #	$NetBSD: files.pxa2x0,v 1.6 2004/05/01 19:09:14 thorpej Exp $
 #
 # Configuration info for Intel PXA2[51]0 CPU support
@@ -21,7 +21,7 @@ file	arch/arm/xscale/pxa2x0_dma.c
 # INTC controller
 device	pxaintc
 attach	pxaintc at pxaip
-file	arch/arm/xscale/pxa2x0_intr.c		pxaintc needs-flag
+file	arch/arm/xscale/pxa2x0_intr.c		pxaintc
 file	arch/arm/xscale/pxa2x0_mutex.c		pxaintc
 #defflag  opt_pxa2x0_gpio.h		PXAGPIO_HAS_GPION_INTRS
 
@@ -38,7 +38,7 @@ file	arch/arm/xscale/pxa2x0_dmac.c		pxadmac needs-flag
 # PXA2x0's built-in timer.
 device	pxaost
 attach	pxaost at pxaip
-file	arch/arm/xscale/pxa2x0_clock.c		pxaost needs-flag
+file	arch/arm/xscale/pxa2x0_clock.c		pxaost
 
 # NS16550 compatible serial ports
 attach	com at pxaip with com_pxaip
diff --git a/sys/arch/arm/xscale/pxa2x0.c b/sys/arch/arm/xscale/pxa2x0.c
index 25b517de205..e550efb2cff 100644
--- a/sys/arch/arm/xscale/pxa2x0.c
+++ b/sys/arch/arm/xscale/pxa2x0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0.c,v 1.18 2014/03/29 18:09:28 guenther Exp $ */
+/*	$OpenBSD: pxa2x0.c,v 1.19 2014/10/18 12:21:56 miod Exp $ */
 /*	$NetBSD: pxa2x0.c,v 1.5 2003/12/12 16:42:44 thorpej Exp $ */
 
 /*
@@ -87,7 +87,6 @@
  *
  */
 
-#include "pxaintc.h"
 #include "pxagpio.h"
 #include "pxadmac.h"
 
diff --git a/sys/arch/landisk/conf/files.landisk b/sys/arch/landisk/conf/files.landisk
index dc862dfff19..c94ca70a799 100644
--- a/sys/arch/landisk/conf/files.landisk
+++ b/sys/arch/landisk/conf/files.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.landisk,v 1.10 2014/07/11 21:54:37 tedu Exp $
+#	$OpenBSD: files.landisk,v 1.11 2014/10/18 12:21:56 miod Exp $
 #	$NetBSD: files.landisk,v 1.2 2006/09/07 01:55:02 uwe Exp $
 
 # maxpartitions must be first item in files.${MACHINE}
@@ -85,7 +85,7 @@ attach	obio at mainbus
 file	arch/landisk/dev/obio.c		obio needs-flag
 
 attach	wdc at obio with wdc_obio
-file	arch/landisk/dev/wdc_obio.c	wdc_obio needs-flag
+file	arch/landisk/dev/wdc_obio.c	wdc_obio
 
 device	power
 attach	power at obio
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 8ebb630cb96..ecbc4eb2c49 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.78 2014/07/11 21:54:37 tedu Exp $
+#	$OpenBSD: files.macppc,v 1.79 2014/10/18 12:21:56 miod Exp $
 
 #
 # macppc-specific configuration info
@@ -112,7 +112,7 @@ file	arch/macppc/pci/macobio.c			macobio
 # kauai ATA glue
 device	kauaiata {}
 attach	kauaiata at pci 
-file	arch/macppc/pci/kauaiata.c			kauaiata needs-flag
+file	arch/macppc/pci/kauaiata.c			kauaiata
 
 #device	esp: scsi, ncr53c9x
 #attach	esp at macobio
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index f34e4813649..d6c8b01fe97 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.vax,v 1.57 2013/09/24 20:10:50 miod Exp $
+#	$OpenBSD: files.vax,v 1.58 2014/10/18 12:21:56 miod Exp $
 #	$NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
@@ -101,12 +101,12 @@ major	{cd = 22}
 # builtin NCR53C95 SCSI Controller on VAXstation 4000 VLC/60/9x
 device	asc: scsi, ncr53c9x
 attach	asc at vsbus with asc_vsbus
-file	arch/vax/vsa/asc_vsbus.c		asc needs-flag
+file	arch/vax/vsa/asc_vsbus.c		asc
 
 # builtin NCR5380 SCSI-controller on VAXstation 
 device	ncr: scsi, ncr5380sbc
 attach	ncr at vsbus
-file	arch/vax/vsa/ncr.c			ncr needs-flag
+file	arch/vax/vsa/ncr.c			ncr
 
 # LANCE ethernet controller on VAXstation
 attach	le at vsbus with le_vsbus: le24
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index e58f21fb710..0f909372749 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.zaurus,v 1.29 2014/07/11 21:54:38 tedu Exp $
+#	$OpenBSD: files.zaurus,v 1.30 2014/10/18 12:21:57 miod Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -58,7 +58,7 @@ file arch/zaurus/dev/zaurus_apm.c		apm_pxaip
 # Zaurus touchpad
 device zts: wsmousedev
 attach zts at pxaip
-file arch/zaurus/dev/zts.c			zts needs-flag
+file arch/zaurus/dev/zts.c			zts
 
 # Zaurus sound
 device	zaudio: audio, auconv, mulaw, i2s, i2c