[src/trunk]: src/sys/dev/marvell Remove unnecessary define.

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e821692a9977
branches:  trunk
changeset: 756295:e821692a9977
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Jul 11 08:34:57 2010 +0000

description:
Remove unnecessary define.
Reorder.
Add necessary attributes.

diffstat:

 sys/dev/marvell/files.discovery |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (55 lines):

diff -r e8e9dec88bd9 -r e821692a9977 sys/dev/marvell/files.discovery
--- a/sys/dev/marvell/files.discovery   Sun Jul 11 07:43:12 2010 +0000
+++ b/sys/dev/marvell/files.discovery   Sun Jul 11 08:34:57 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.discovery,v 1.13 2010/06/02 06:18:11 kiyohara Exp $
+#      $NetBSD: files.discovery,v 1.14 2010/07/11 08:34:57 kiyohara Exp $
 #
 # Config file and device description for machine-independent support for
 # the Marvell (formerly Galileo Technology) Discovery system controllers.
@@ -28,15 +28,13 @@
 file   dev/marvell/gt.c                gt
 
 # PCI Interface
-define gtpci
+device gtpci: pcibus
 file   dev/marvell/gtpci.c             gtpci & gtpci_gt needs-flag
-device gtpci: pcibus
 attach gtpci at gt with gtpci_gt
 
 # PCI Express Interface
-#define        mvpex
+#device        mvpex: pcibus
 #file  dev/marvell/mvpex.c             mvpex & (mvpex_gt|mvpex_mbus) needs-flag
-#device        mvpex: pcibus
 #attach        mvpex at gt with mvpex_gt
 
 # Fast ethernet
@@ -74,15 +72,13 @@
 #file  dev/marvell/ehci_mv.c           mvusb_gt | mvusb_mbus
 
 # Cryptographic Engines and Security Accelerator
-#define        mvcesa
+#device        mvcesa: opencrypto
 #file  dev/marvell/mvcesa.c            mvcesa
-#device  mvcesa: opencrypto
-#attach  mvcesa at gt with mvcesa_gt
+#attach        mvcesa at gt with mvcesa_gt
 
 # Two-Wire Serial Interface
-define gttwsi
+device gttwsi: i2cbus
 file   dev/marvell/gttwsi.c            gttwsi
-device gttwsi: i2cbus, gttwsi
 attach gttwsi at gt with gttwsi_gt
 
 # UART Interface
@@ -90,7 +86,6 @@
 #file  dev/marvell/com_mv.c            mvuart_gt | mvuart_mbus
 
 # IDMA Controller and XOR Engine
-define gtidmac
+device gtidmac: dmover_service
 file   dev/marvell/gtidmac.c           gtidmac
-device gtidmac: dmover_service
 attach gtidmac at gt with gtidmac_gt