From fd09c205fc57b90a782cac33449ef172575d0a8c Mon Sep 17 00:00:00 2001 From: Sven Schwermer Date: Wed, 21 Nov 2018 08:43:56 +0100 Subject: usb: s/CONFIG_DM_USB/CONFIG_IS_ENABLED(DM_USB)/ This allows to disable the USB driver model in SPL because it checks the CONFIG_SPL_DM_USB variable for SPL builds. Nothing changes for regular non-SPL builds. Signed-off-by: Sven Schwermer --- drivers/usb/host/ehci-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/usb/host/ehci-pci.c') diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 6150f3d8885..04e7c5e37f8 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -19,7 +19,7 @@ struct ehci_pci_priv { struct phy phy; }; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr, struct ehci_hcor **ret_hcor) { @@ -121,9 +121,9 @@ int ehci_hcd_stop(int index) { return 0; } -#endif /* nCONFIG_DM_USB */ +#endif /* !CONFIG_IS_ENABLED(DM_USB) */ -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_pci_probe(struct udevice *dev) { struct ehci_hccr *hccr; @@ -173,4 +173,4 @@ static struct pci_device_id ehci_pci_supported[] = { U_BOOT_PCI_DEVICE(ehci_pci, ehci_pci_supported); -#endif /* CONFIG_DM_USB */ +#endif /* CONFIG_IS_ENABLED(DM_USB) */ -- cgit v1.2.3