From: Jayachandran C <jayachandranc@netlogicmicro.com>
Date: Fri, 18 Nov 2011 06:42:42 +0000 (+0530)
Subject: usb: Netlogic: Use CPU_XLR in place of NLM_XLR
X-Git-Tag: MMI-PSA29.97-13-9~17726^2~54
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3af5154a869bc278a829bb03e65a709480e821b0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

usb: Netlogic: Use CPU_XLR in place of NLM_XLR

Use CONFIG_CPU_XLR instead of CONFIG_NLM_XLR, the NLM_XLR config
option is redundant and is being removed.

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 3ff9f82f7263..0f15d392aae1 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1324,7 +1324,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_pxa168_driver
 #endif
 
-#ifdef CONFIG_NLM_XLR
+#ifdef CONFIG_CPU_XLR
 #include "ehci-xls.c"
 #define PLATFORM_DRIVER		ehci_xls_driver
 #endif
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 03c4631dc27a..95d639cd5b8c 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1114,7 +1114,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ohci_hcd_ath79_driver
 #endif
 
-#ifdef CONFIG_NLM_XLR
+#ifdef CONFIG_CPU_XLR
 #include "ohci-xls.c"
 #define PLATFORM_DRIVER		ohci_xls_driver
 #endif