diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
| commit | 67cf22cbdef8c62ffa28b4caf935825fe410c68d (patch) | |
| tree | 57659ce202ce5f782442db271e67bd8e3ce409ba /common/usb_kbd.c | |
| parent | 5d5833af64bbafb308b3a2415e3186def678861b (diff) | |
| parent | 1af9bfd334a5c92cb3123be7c8da3ba0f522cf4a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Introduce CONFIG_SPL_DM_USB
Diffstat (limited to 'common/usb_kbd.c')
| -rw-r--r-- | common/usb_kbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c index fdeb2aed24..020f0d4117 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) { |