This patch adds the MCP55 PCI IDs (without which the southbridge code
won't compile), and breaks an unnecessary dependency on the usbdebug
code.
Signed-off-by: Ed Swierk <eswierk@arastra.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2543 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 3472187..74a60b2 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -945,6 +945,33 @@
#define PCI_DEVICE_ID_NVIDIA_CK8S_PCI 0x00ed
#define PCI_DEVICE_ID_NVIDIA_CK8S_PCI_AGP 0x00e2
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC 0x0360
+#define PCI_DEVICE_ID_NVIDIA_MCP55_SLAVE 0x0361
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_2 0x0362
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_3 0x0363
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_4 0x0364
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_5 0x0365
+#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_6 0x0366
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PRO 0x0367
+#define PCI_DEVICE_ID_NVIDIA_MCP55_SM2 0x0368
+#define PCI_DEVICE_ID_NVIDIA_MCP55_IDE 0x036E
+#define PCI_DEVICE_ID_NVIDIA_MCP55_SATA0 0x037E
+#define PCI_DEVICE_ID_NVIDIA_MCP55_SATA1 0x037F
+#define PCI_DEVICE_ID_NVIDIA_MCP55_NIC 0x0372
+#define PCI_DEVICE_ID_NVIDIA_MCP55_NIC_BRIDGE 0x0373
+#define PCI_DEVICE_ID_NVIDIA_MCP55_AZA 0x0371
+#define PCI_DEVICE_ID_NVIDIA_MCP55_USB 0x036C
+#define PCI_DEVICE_ID_NVIDIA_MCP55_USB2 0x036D
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCI 0x0370
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_B_C 0x0374
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_E 0x0375
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_A 0x0376
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_F 0x0377
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_D 0x0378
+#define PCI_DEVICE_ID_NVIDIA_MCP55_HT 0x0369
+#define PCI_DEVICE_ID_NVIDIA_MCP55_TRIM 0x036A
+#define PCI_DEVICE_ID_NVIDIA_MCP55_PMU 0x036B
+
#define PCI_VENDOR_ID_NVIDIA 0x10de
#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020
#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028
diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb2.c b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
index 0132bb1..2463a340 100644
--- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
@@ -27,7 +27,9 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include "mcp55.h"
+#if CONFIG_USBDEBUG_DIRECT
#include <usbdebug_direct.h>
+#endif
extern struct ehci_debug_info dbg_info;