svn commit: r190248 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb sparc64/conf

[Pyun YongHyeon]

Author: yongari
Date: Sun Mar 22 06:28:53 2009
New Revision: 190248
URL: http://svn.freebsd.org/changeset/base/190248

Log:
  MFC r189715:
    Uncomment txp(4), txp(4) should work on all architectures.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/sparc64/conf/GENERIC

Modified: stable/7/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/7/sys/sparc64/conf/GENERIC	Sun Mar 22 06:26:47 2009	(r190247)
+++ stable/7/sys/sparc64/conf/GENERIC	Sun Mar 22 06:28:53 2009	(r190248)
@@ -155,7 +155,7 @@ device		uart		# Multi-uart driver
 device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 #device		ixgb		# Intel PRO/10GbE Ethernet Card
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-#device		txp		# 3Com 3cR990 (``Typhoon'')
+device		txp		# 3Com 3cR990 (``Typhoon'')
 #device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.