[Glibc-bsd-commits] r4132 - trunk/kfreebsd-10/debian/patches

[Robert Millan]

Author: rmh
Date: 2012-02-26 12:21:27 +0000 (Sun, 26 Feb 2012)
New Revision: 4132

Modified:
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
... and remove it from sys/i386/conf/GENERIC too.

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-26 12:19:16 UTC (rev 4131)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-26 12:21:27 UTC (rev 4132)
@@ -244,7 +244,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -354,15 +318,15 @@
+@@ -354,14 +318,6 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  
@@ -259,15 +259,6 @@
  # MMC/SD
  device		mmc		# MMC/SD bus
  device		mmcsd		# MMC/SD memory card
- device		sdhci		# Generic PCI SD Host Controller
-+
-+# Alternate queueing
-+options		ALTQ
-+options		ALTQ_CBQ	# Class Bases Queuing (CBQ)
-+options		ALTQ_RED	# Random Early Detection (RED)
-+options		ALTQ_RIO	# RED In/Out
-+options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
-+options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
 --- /dev/null
 +++ b/sys/conf/DEBIAN
 @@ -0,0 +1,25 @@