Sync LiveDVD kernel configs with GENERIC.

DragonFlyBSD · Sep 13, 2009 · 75cef8a · 75cef8a
1 parent d5ec20f
commit 75cef8a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/nrelease/gui/root/DFLYLIVE b/nrelease/gui/root/DFLYLIVE
@@ -122,7 +122,6 @@ device		nataraid		# support for ATA software RAID
 					# controllers
 device		natausb			# ATA-over-USB support
 options 	ATA_STATIC_ID		# Static device numbering
-options		PCI_MAP_FIXUP		# Needed for NATA
 
 # LEGACY ATA and ATAPI devices
 #device		ata0	at isa? port IO_WD1 irq 14
@@ -164,6 +163,7 @@ device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		sg		# Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
 device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
@@ -190,6 +190,9 @@ device		psm0	at atkbdc? irq 12
 
 device		vga0	at isa?
 
+# kbdmux is the keyboard multiplexer
+device		kbdmux
+
 # splash screen/screen saver
 pseudo-device	splash
 
@@ -243,6 +246,8 @@ device		ig_hal		# Intel PRO/1000 hardware abstraction layer
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		ae		# Attansic/Atheros L2 Fast Ethernet
+device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114
 device		bce		# Broadcom NetXtreme II Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet

diff --git a/nrelease/gui/root/DFLYLIVE-SMP b/nrelease/gui/root/DFLYLIVE-SMP
@@ -122,7 +122,6 @@ device		nataraid		# support for ATA software RAID
 					# controllers
 device		natausb			# ATA-over-USB support
 options 	ATA_STATIC_ID		# Static device numbering
-options		PCI_MAP_FIXUP		# Needed for NATA
 
 # LEGACY ATA and ATAPI devices
 #device		ata0	at isa? port IO_WD1 irq 14
@@ -164,6 +163,7 @@ device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		sg		# Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
 device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
@@ -190,6 +190,9 @@ device		psm0	at atkbdc? irq 12
 
 device		vga0	at isa?
 
+# kbdmux is the keyboard multiplexer
+device		kbdmux
+
 # splash screen/screen saver
 pseudo-device	splash
 
@@ -243,6 +246,8 @@ device		ig_hal		# Intel PRO/1000 hardware abstraction layer
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		ae		# Attansic/Atheros L2 Fast Ethernet
+device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114
 device		bce		# Broadcom NetXtreme II Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet

diff --git a/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC b/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
@@ -122,7 +122,6 @@ device		nataraid		# support for ATA software RAID
 					# controllers
 device		natausb			# ATA-over-USB support
 options 	ATA_STATIC_ID		# Static device numbering
-options		PCI_MAP_FIXUP		# Needed for NATA
 
 # LEGACY ATA and ATAPI devices
 #device		ata0	at isa? port IO_WD1 irq 14
@@ -164,6 +163,7 @@ device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		sg		# Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
 device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
@@ -190,6 +190,9 @@ device		psm0	at atkbdc? irq 12
 
 device		vga0	at isa?
 
+# kbdmux is the keyboard multiplexer
+device		kbdmux
+
 # splash screen/screen saver
 pseudo-device	splash
 
@@ -243,6 +246,8 @@ device		ig_hal		# Intel PRO/1000 hardware abstraction layer
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		ae		# Attansic/Atheros L2 Fast Ethernet
+device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114
 device		bce		# Broadcom NetXtreme II Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet