diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 17:58:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 17:58:08 +0100 |
| commit | 5796e682e6495923b0fea0cf1f2b095520bc29ec (patch) | |
| tree | f91ed4b895dd2564d2ccda447fabb132c0e0af7a /arch/arm/configs | |
| parent | 95f7f383b630d3ec75d4eeeb06a1df46044e1ec2 (diff) | |
| parent | 23bbeaef90ab7607d03428bbb708efe44f43c761 (diff) | |
Merge tag 'davinci-for-v4.16/soc-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "TI DaVinci SoC support updates for v4.16" from Sekhar Nori:
DaVinci SoC updates consisting of non-critical bug fixes including constifying
data structures, removal of unnecessary newlines from gpio labels and code
simplification.
Also a defconfig update for DaVinci, enabling support for USB network adaptors.
* tag 'davinci-for-v4.16/soc-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: constify gpio_led
ARM: davinci: drop unneeded newline
ARM: davinci: Use PTR_ERR_OR_ZERO()
ARM: davinci: make davinci_soc_info structures const
ARM: davinci: make argument to davinci_common_init() as const
ARM: davinci_all_defconfig: enable support for USB network adaptors
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index bd0cf22f9ceb..026154c1d55a 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -94,6 +94,7 @@ CONFIG_PPP=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m +CONFIG_USB_USBNET=m CONFIG_INPUT_EVDEV=m CONFIG_INPUT_EVBUG=m CONFIG_KEYBOARD_ATKBD=m |