diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
index c304ab4..22a0e7b 100644
--- a/src/northbridge/intel/sandybridge/chipset.cb
+++ b/src/northbridge/intel/sandybridge/chipset.cb
@@ -25,7 +25,7 @@
 			device pci 16.2 alias me_ide_r off end   # Management Engine IDE-R
 			device pci 16.3 alias me_kt off end      # Management Engine KT
 			device pci 19.0 alias gbe off end        # Intel Gigabit Ethernet
-			device pci 1a.0 alias ehci2 off end      # USB2 EHCI #2
+			device pci 1a.0 alias ehci2 off ops bd82x6x_usb_ehci_ops end
 			device pci 1b.0 alias hda off ops bd82x6x_azalia_ops end        # High Definition Audio
 			device pci 1c.0 alias pcie_rp1 off ops bd82x6x_pcie_rp_ops end   # PCIe Port #1
 			device pci 1c.1 alias pcie_rp2 off ops bd82x6x_pcie_rp_ops end   # PCIe Port #2
@@ -35,7 +35,7 @@
 			device pci 1c.5 alias pcie_rp6 off ops bd82x6x_pcie_rp_ops end   # PCIe Port #6
 			device pci 1c.6 alias pcie_rp7 off ops bd82x6x_pcie_rp_ops end   # PCIe Port #7
 			device pci 1c.7 alias pcie_rp8 off ops bd82x6x_pcie_rp_ops end   # PCIe Port #8
-			device pci 1d.0 alias ehci1 off end      # USB2 EHCI #1
+			device pci 1d.0 alias ehci1 off ops bd82x6x_usb_ehci_ops end
 			device pci 1e.0 alias pci_bridge off ops bd82x6x_pci_bridge_ops end
 			device pci 1f.0 alias lpc on ops bd82x6x_lpc_bridge_ops end
 			device pci 1f.2 alias sata1 off end      # SATA Controller 1
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index 1cb260a..f05d932 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -90,7 +90,7 @@
 	.set_subsystem	= &usb_ehci_set_subsystem,
 };
 
-static struct device_operations usb_ehci_ops = {
+struct device_operations bd82x6x_usb_ehci_ops = {
 	.read_resources		= pci_ehci_read_resources,
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
@@ -98,12 +98,3 @@
 	.ops_pci		= &lops_pci,
 	.acpi_name		= usb_ehci_acpi_name,
 };
-
-static const unsigned short pci_device_ids[] = { 0x1c26, 0x1c2d, 0x1e26, 0x1e2d,
-						 0 };
-
-static const struct pci_driver pch_usb_ehci __pci_driver = {
-	.ops	 = &usb_ehci_ops,
-	.vendor	 = PCI_VID_INTEL,
-	.devices = pci_device_ids,
-};