diff options
author | Dave Airlie <airlied@redhat.com> | 2016-05-09 06:49:56 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 06:49:56 +0300 |
commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /drivers/tty/serial/8250/Kconfig | |
parent | ba391646d0d43aee3596b616113cce0f22dde627 (diff) | |
parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
download | linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.xz |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'drivers/tty/serial/8250/Kconfig')
-rw-r--r-- | drivers/tty/serial/8250/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 64742a086ae3..4d7cb9c04fce 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -324,7 +324,6 @@ config SERIAL_8250_EM config SERIAL_8250_RT288X bool "Ralink RT288x/RT305x/RT3662/RT3883 serial port support" depends on SERIAL_8250 - depends on MIPS || COMPILE_TEST default y if MIPS_ALCHEMY || SOC_RT288X || SOC_RT305X || SOC_RT3883 || SOC_MT7620 help Selecting this option will add support for the alternate register |