diff --git a/src/mainboard/foxconn/g41s-k/devicetree.cb b/src/mainboard/foxconn/g41s-k/devicetree.cb
index a63845760c..84cf353f7e 100644
--- a/src/mainboard/foxconn/g41s-k/devicetree.cb
+++ b/src/mainboard/foxconn/g41s-k/devicetree.cb
@@ -27,13 +27,9 @@ chip northbridge/intel/x4x		# Northbridge
 	end
 	device domain 0 on		# PCI domain
 		subsystemid 0x105b 0x0dda inherit
-		device pci 0.0 on			# Host Bridge
-			subsystemid 0x105b 0x0dda
-		end
+		device pci 0.0 on end			# Host Bridge
 		device pci 1.0 on end			# PEG
-		device pci 2.0 on			# Integrated graphics controller
-			subsystemid 0x105b 0x0dda
-		end
+		device pci 2.0 on end			# Integrated graphics controller
 		device pci 2.1 off end			# Integrated graphics controller 2
 		device pci 3.0 off end			# ME
 		device pci 3.1 off end			# ME
@@ -55,39 +51,24 @@ chip northbridge/intel/x4x		# Northbridge
 			register "sata_ahci" = "0x0"	# AHCI does not work
 			register "sata_ports_implemented" = "0x3"
 
-			device pci 1b.0 on		# Audio
-				subsystemid 0x105b 0x0dda
-			end
+			device pci 1b.0 on end		# Audio
 			device pci 1c.0 on end		# PCIe 1
 			device pci 1c.1 on		# PCIe 2 (NIC)
-				device pci 00.0 on		# PCI 10ec:8168
-					subsystemid 0x105b 0x0dda
-				end
+				device pci 00.0 on end		# PCI 10ec:8168
 			end
 			device pci 1c.2 off end		# PCIe 3
 			device pci 1c.3 off end		# PCIe 4
 			device pci 1c.4 off end		# PCIe 5
 			device pci 1c.5 off end		# PCIe 6
-			device pci 1d.0 on		# USB
-				subsystemid 0x105b 0x0dda
-			end
-			device pci 1d.1 on		# USB
-				subsystemid 0x105b 0x0dda
-			end
-			device pci 1d.2 on		# USB
-				subsystemid 0x105b 0x0dda
-			end
-			device pci 1d.3 on		# USB
-				subsystemid 0x105b 0x0dda
-			end
-			device pci 1d.7 on		# USB
-				subsystemid 0x105b 0x0dda
-			end
+			device pci 1d.0 on end		# USB
+			device pci 1d.1 on end		# USB
+			device pci 1d.2 on end		# USB
+			device pci 1d.3 on end		# USB
+			device pci 1d.7 on end		# USB
 			device pci 1e.0 on end		# PCI bridge
 			device pci 1e.2 off end		# AC'97 Audio
 			device pci 1e.3 off end		# AC'97 Modem
 			device pci 1f.0 on		# ISA bridge
-				subsystemid 0x105b 0x0dda
 				chip superio/ite/it8720f	# Super I/O
 					register "TMPIN1.mode" = "THERMAL_DIODE"
 					register "TMPIN1.offset" = "0"
@@ -179,12 +160,8 @@ chip northbridge/intel/x4x		# Northbridge
 				end
 			end
 			device pci 1f.1 off end		# PATA/IDE
-			device pci 1f.2 on		# SATA
-				subsystemid 0x105b 0x0dda
-			end
-			device pci 1f.3 on		# SMbus
-				subsystemid 0x105b 0x0dda
-			end
+			device pci 1f.2 on end		# SATA
+			device pci 1f.3 on end		# SMbus
 		end
 	end
 end