4 files changed, 6 insertions, 6 deletions
diff --git a/src/southbridge/amd/amd8111/Config.lb b/src/southbridge/amd/amd8111/Config.lb
index 57d299cfbf..2a55714eec 100644
--- a/src/southbridge/amd/amd8111/Config.lb
+++ b/src/southbridge/amd/amd8111/Config.lb
@@ -1,10 +1,10 @@
 config amd8111.h
 driver amd8111.o
-driver amd8111_usb.o
+#driver amd8111_usb.o
 driver amd8111_lpc.o
 driver amd8111_ide.o
 driver amd8111_acpi.o
-driver amd8111_usb2.o
+#driver amd8111_usb2.o
 driver amd8111_ac97.o
 driver amd8111_nic.o
 driver amd8111_pci.o
diff --git a/src/southbridge/amd/amd8111/amd8111_lpc.c b/src/southbridge/amd/amd8111/amd8111_lpc.c
index b0e2cf501d..9c5b5a674e 100644
--- a/src/southbridge/amd/amd8111/amd8111_lpc.c
+++ b/src/southbridge/amd/amd8111/amd8111_lpc.c
@@ -10,6 +10,8 @@
 #include <pc80/mc146818rtc.h>
 #include "amd8111.h"
 
+void isa_dma_init(void); /* from /pc80/isa-dma.c */
+
 #define NMI_OFF 0
 
 struct ioapicreg {
diff --git a/src/southbridge/amd/amd8111/amd8111_usb.c b/src/southbridge/amd/amd8111/amd8111_usb.c
index 407729a381..669b828e55 100644
--- a/src/southbridge/amd/amd8111/amd8111_usb.c
+++ b/src/southbridge/amd/amd8111/amd8111_usb.c
@@ -7,19 +7,17 @@
 
 static void usb_init(struct device *dev)
 {
+#if 0
 	uint32_t cmd;
 
-#if 0
 	printk_debug("USB: Setting up controller.. ");
 	cmd = pci_read_config32(dev, PCI_COMMAND);
 	pci_write_config32(dev, PCI_COMMAND, 
 		cmd | PCI_COMMAND_IO | PCI_COMMAND_MEMORY | 
 		PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE);
 
-
 	printk_debug("done.\n");
 #endif
-
 }
 
 static struct device_operations usb_ops  = {
diff --git a/src/southbridge/amd/amd8111/amd8111_usb2.c b/src/southbridge/amd/amd8111/amd8111_usb2.c
index 5f98b668cb..12a9cfb010 100644
--- a/src/southbridge/amd/amd8111/amd8111_usb2.c
+++ b/src/southbridge/amd/amd8111/amd8111_usb2.c
@@ -9,9 +9,9 @@
 
 static void usb2_init(struct device *dev)
 {
+#if 0
 	uint32_t cmd;
 
-#if 0
 	printk_debug("USB: Setting up controller.. ");
 	cmd = pci_read_config32(dev, PCI_COMMAND);
 	pci_write_config32(dev, PCI_COMMAND,