diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ad07a854fa15..3163d918f120 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.230 2008/10/11 21:54:11 bouyer Exp $
+# $NetBSD: GENERIC,v 1.231 2008/10/19 11:34:31 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.230 $"
+#ident 		"GENERIC-$Revision: 1.231 $"
 
 maxusers	64		# estimated number of users
 
@@ -325,7 +325,7 @@ puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
 #amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
 #hpet* 	at amdpcib?
 
-#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
+ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
 					# watchdog and Speedstep support.
 
 aapic* 	at pci? dev ? function ?	# AMD 8131 IO apic
@@ -336,7 +336,7 @@ agp* 	at pchb?
 isa0	at mainbus?
 isa0	at pcib?
 #isa0 	at amdpcib?
-#isa0 	at ichlpcib?
+isa0 	at ichlpcib?
 
 # CardBus bridge support
 cbb*		at pci? dev ? function ?
@@ -876,6 +876,10 @@ ugen*	at uhub? port ?
 # On ugen bulk endpoints, perform read-ahead and write-behind.
 options	UGEN_BULK_RA_WB
 
+# USB 3G datacards
+u3g*	at uhub? port ?
+ucom*	at u3g?
+
 # USB generic serial port (e.g., data over cellular)
 ugensa*	at uhub? port ?
 ucom*	at ugensa?
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index bfb3e5831abc..fe398260e05f 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.31 2008/10/11 21:54:11 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.32 2008/10/19 11:34:31 joerg Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -226,7 +226,7 @@ ppb*		at pci? dev ? function ?	# PCI-PCI bridges
 pci*		at ppb? bus ?
 
 # PCI bridges
-#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
+ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
 					# watchdog and SpeedStep support
 pcib*	at pci? dev ? function ?	# PCI-ISA bridges
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
@@ -237,7 +237,7 @@ puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
 agp* 	at pchb?
 
 # ISA bus support
-#isa0	at ichlpcib?
+isa0	at ichlpcib?
 isa0	at pcib?
 isa0	at hypervisor?
 
diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX
index 2e8f71a3975d..388ef3d856b7 100644
--- a/sys/arch/evbarm/conf/GUMSTIX
+++ b/sys/arch/evbarm/conf/GUMSTIX
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.28 2008/07/31 07:41:00 simonb Exp $
+#	$NetBSD: GUMSTIX,v 1.29 2008/10/19 11:34:31 joerg Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -402,6 +402,10 @@ sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 # On ugen bulk endpoints, perform read-ahead and write-behind.
 #options UGEN_BULK_RA_WB
 
+# USB 3G datacards
+#u3g*	at uhub? port ?
+#ucom*	at u3g?
+
 # USB generic serial port (e.g., data over cellular)
 #ugensa*	at uhub? port ?
 #ucom*	at ugensa?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 870b540010e2..e8ca4f9c1f03 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.913 2008/10/11 21:54:11 bouyer Exp $
+# $NetBSD: GENERIC,v 1.914 2008/10/19 11:34:31 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.913 $"
+#ident 		"GENERIC-$Revision: 1.914 $"
 
 maxusers	64		# estimated number of users
 
@@ -1217,6 +1217,10 @@ ugen*	at uhub? port ?
 # On ugen bulk endpoints, perform read-ahead and write-behind.
 options UGEN_BULK_RA_WB
 
+# USB 3G datacards
+u3g*	at uhub? port ?
+ucom*	at u3g?
+
 # USB generic serial port (e.g., data over cellular)
 ugensa*	at uhub? port ?
 ucom*	at ugensa?