diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-25 11:19:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-25 11:19:46 +0100 |
| commit | 0f8b29fabacbcf0e617896c7ea832b7ea2ef2406 (patch) | |
| tree | 0187f2baef24b5d78d94aecc7057356a36c58b5d /drivers/net/dsa/hirschmann/Kconfig | |
| parent | tty: fix up iterate_tty_read() EOVERFLOW handling (diff) | |
| parent | Linux 5.11-rc5 (diff) | |
| download | linux-0f8b29fabacbcf0e617896c7ea832b7ea2ef2406.tar.xz linux-0f8b29fabacbcf0e617896c7ea832b7ea2ef2406.zip | |
Merge 5.11-rc5 into tty-next
We need the fixes in here and this resolves a merge issue in
drivers/tty/tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/dsa/hirschmann/Kconfig')
| -rw-r--r-- | drivers/net/dsa/hirschmann/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/hirschmann/Kconfig b/drivers/net/dsa/hirschmann/Kconfig index 222dd35e2c9d..e01191107a4b 100644 --- a/drivers/net/dsa/hirschmann/Kconfig +++ b/drivers/net/dsa/hirschmann/Kconfig @@ -4,6 +4,7 @@ config NET_DSA_HIRSCHMANN_HELLCREEK depends on HAS_IOMEM depends on NET_DSA depends on PTP_1588_CLOCK + depends on LEDS_CLASS select NET_DSA_TAG_HELLCREEK help This driver adds support for Hirschmann Hellcreek TSN switches. |