From 7e00a44b773ba16b72fa1ca69825407be0c98ad5 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
Date: Tue, 25 May 2010 17:09:05 +0000
Subject: also rename the config option. Signed-off-by: Stefan Reinauer
 <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de>

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5588 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/southbridge/amd/sb600/sb600_usb.c              | 4 ++--
 src/southbridge/amd/sb700/sb700_usb.c              | 4 ++--
 src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c | 6 +++---
 src/southbridge/nvidia/mcp55/mcp55_usb2.c          | 6 +++---
 src/southbridge/sis/sis966/sis966_usb2.c           | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/southbridge')

diff --git a/src/southbridge/amd/sb600/sb600_usb.c b/src/southbridge/amd/sb600/sb600_usb.c
index 3b5e5f562b..942f2309d6 100644
--- a/src/southbridge/amd/sb600/sb600_usb.c
+++ b/src/southbridge/amd/sb600/sb600_usb.c
@@ -127,7 +127,7 @@ static void usb_init2(struct device *dev)
 
 static void usb_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 old_debug;
@@ -137,7 +137,7 @@ static void usb_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res)
diff --git a/src/southbridge/amd/sb700/sb700_usb.c b/src/southbridge/amd/sb700/sb700_usb.c
index 3b08798209..e1bcf0f723 100644
--- a/src/southbridge/amd/sb700/sb700_usb.c
+++ b/src/southbridge/amd/sb700/sb700_usb.c
@@ -169,7 +169,7 @@ static void usb_init2(struct device *dev)
 
 static void usb_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 old_debug;
@@ -179,7 +179,7 @@ static void usb_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res)
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
index 530518c8e2..fb9033b3cc 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
@@ -23,7 +23,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include "i82801gx.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 #include <arch/io.h>
@@ -87,7 +87,7 @@ static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned devic
 
 static void usb_ehci_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	u32 base;
 	u32 usb_debug;
@@ -97,7 +97,7 @@ static void usb_ehci_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(usb_debug);
 	if (!res) return;
diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb2.c b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
index cf603848ad..fbb011178f 100644
--- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
@@ -27,7 +27,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include "mcp55.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 
@@ -43,7 +43,7 @@ static void usb2_init(struct device *dev)
 
 static void usb2_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	unsigned base;
 	unsigned old_debug;
@@ -53,7 +53,7 @@ static void usb2_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res) return;
diff --git a/src/southbridge/sis/sis966/sis966_usb2.c b/src/southbridge/sis/sis966/sis966_usb2.c
index 9d0fa15a57..5522c33412 100644
--- a/src/southbridge/sis/sis966/sis966_usb2.c
+++ b/src/southbridge/sis/sis966/sis966_usb2.c
@@ -30,7 +30,7 @@
 #include <device/pci_ops.h>
 #include <arch/io.h>
 #include "sis966.h"
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 #include <usbdebug.h>
 #endif
 
@@ -123,7 +123,7 @@ static void usb2_init(struct device *dev)
 
 static void usb2_set_resources(struct device *dev)
 {
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	struct resource *res;
 	unsigned base;
 	unsigned old_debug;
@@ -133,7 +133,7 @@ static void usb2_set_resources(struct device *dev)
 #endif
 	pci_dev_set_resources(dev);
 
-#if CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG
 	res = find_resource(dev, 0x10);
 	set_ehci_debug(old_debug);
 	if (!res) return;
-- 
cgit v1.2.3