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 --- common/usb_kbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/usb_kbd.c') diff --git a/common/usb_kbd.c b/common/usb_kbd.c index fdeb2ae..020f0d4 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -539,7 +539,7 @@ static int probe_usb_keyboard(struct usb_device *dev) return 0; } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) /* Search for keyboard and register it if found. */ int drv_usb_kbd_init(void) { @@ -602,7 +602,7 @@ int usb_kbd_deregister(int force) #endif -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int usb_kbd_probe(struct udevice *dev) { -- cgit v1.1