diff options
| author | Tom Rini <[email protected]> | 2020-08-28 08:51:37 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-08-28 08:51:37 -0400 |
| commit | 9f04a634ef331b4fc6b3e677f276156192a413c7 (patch) | |
| tree | a6b8663e5d156f85846d187248597888043e0d3e /drivers | |
| parent | f87c80ade3911f3d518036a28370fe44c85a95c7 (diff) | |
| parent | 2ed1b242ab2f9ee7541ae0a655de67832a3eebc1 (diff) | |
Merge branch '2020-08-27-misc-fixes'
- Fix for gd->ram_top and bootm_size calculations
- Assorted Kconfig entry cleanups / fixes.
- Make checkpatch.pl error on fdt_high/initrd_high=0xffffffff
- Resync scripts/setlocalversion
- Other minor bugfixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 06d39df1d38..c19d09bc417 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -260,6 +260,7 @@ config PCIE_MEDIATEK config PCIE_ROCKCHIP bool "Enable Rockchip PCIe driver" + depends on ARCH_ROCKCHIP select DM_PCI select PHY_ROCKCHIP_PCIE default y if ROCKCHIP_RK3399 diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 756a4ec402e..34881a12b8b 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -113,14 +113,14 @@ choice ---help--- Enable a polling mechanism for USB keyboard. - config SYS_USB_EVENT_POLL - bool "Interrupt polling" +config SYS_USB_EVENT_POLL + bool "Interrupt polling" - config SYS_USB_EVENT_POLL_VIA_INT_QUEUE - bool "Poll via interrupt queue" +config SYS_USB_EVENT_POLL_VIA_INT_QUEUE + bool "Poll via interrupt queue" - config SYS_USB_EVENT_POLL_VIA_CONTROL_EP - bool "Poll via control EP" +config SYS_USB_EVENT_POLL_VIA_CONTROL_EP + bool "Poll via control EP" endchoice |