diff --git a/src/northbridge/amd/pi/00730F01/chipset.cb b/src/northbridge/amd/pi/00730F01/chipset.cb
index 40eb3ef..b63d9fd 100644
--- a/src/northbridge/amd/pi/00730F01/chipset.cb
+++ b/src/northbridge/amd/pi/00730F01/chipset.cb
@@ -7,7 +7,9 @@
 
 	device domain 0 on
 		ops amd_fam16_mod30_pci_domain_ops
-		device pci 0.0 alias gnb			on  end
+		device pci 0.0 alias gnb			on
+			ops amd_pi_northbridge_ops
+		end
 		device pci 0.2 alias iommu			off end
 		device pci 1.0 alias gfx			off end
 		device pci 1.1 alias gfx_hda			off end
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index be4e75a..9fa9f2d 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -633,7 +633,7 @@
 	return current;
 }
 
-static struct device_operations northbridge_operations = {
+struct device_operations amd_pi_northbridge_ops = {
 	.read_resources	  = nb_read_resources,
 	.set_resources	  = nb_set_resources,
 	.enable_resources = pci_dev_enable_resources,
@@ -643,12 +643,6 @@
 	.write_acpi_tables = agesa_write_acpi_tables,
 };
 
-static const struct pci_driver family16_northbridge __pci_driver = {
-	.ops	= &northbridge_operations,
-	.vendor = PCI_VID_AMD,
-	.device = PCI_DID_AMD_16H_MODEL_303F_NB_HT,
-};
-
 static void fam16_finalize(void *chip_info)
 {
 	struct device *dev;