[src/trunk]: src/sys/arch/sparc/conf Move some devices where they should belo...

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

details:   https://anonhg.NetBSD.org/src/rev/542d241851c0
branches:  trunk
changeset: 749344:542d241851c0
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Nov 27 11:05:45 2009 +0000

description:
Move some devices where they should belong to.

diffstat:

 sys/arch/sparc/conf/GENERIC |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r 1d6f62ac3727 -r 542d241851c0 sys/arch/sparc/conf/GENERIC
--- a/sys/arch/sparc/conf/GENERIC       Fri Nov 27 11:04:18 2009 +0000
+++ b/sys/arch/sparc/conf/GENERIC       Fri Nov 27 11:05:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.216 2009/09/27 13:27:44 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.217 2009/11/27 11:05:45 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.216 $"
+#ident                 "GENERIC-$Revision: 1.217 $"
 
 maxusers       32
 
@@ -484,14 +484,6 @@
 #atabus* at ata?
 #wd*   at atabus? drive ? flags 0x0000
 
-## PCMCIA wavelan card
-#wi*   at pcmcia? function ?           # Lucent WaveLan IEEE (802.11)
-
-#
-# accept filters
-pseudo-device   accf_data              # "dataready" accept filter
-pseudo-device   accf_http              # "httpready" accept filter
-
 ## A disk-like interface to files.  Can be used to create floppy, CD,
 ## miniroot images, etc.
 
@@ -576,6 +568,9 @@
 #ne*   at pcmcia?
 #sm*   at pcmcia?
 
+## PCMCIA wavelan card
+#wi*   at pcmcia? function ?           # Lucent WaveLan IEEE (802.11)
+
 # MII/PHY support
 exphy* at mii? phy ?                   # 3Com internal PHYs
 icsphy*        at mii? phy ?                   # Integrated Circuit Systems ICS189x
@@ -633,6 +628,10 @@
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
 pseudo-device  agr                     # IEEE 802.3ad link aggregation
 
+## accept filters
+pseudo-device   accf_data              # "dataready" accept filter
+pseudo-device   accf_http              # "httpready" accept filter
+
 #### Audio and video devices
 
 ## /dev/audio support (`audioamd' plus `audio')