diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:20:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:20:43 -0800 |
| commit | eeec0434e8b89fa5f29d71e5f8044dcec7939d1a (patch) | |
| tree | b4851b2b1129f1afba1abea1230d3f409b237a3a /arch/arm/Kconfig.debug | |
| parent | 8a333cc7bee2c8200e707681e8820d2de8a29946 (diff) | |
| parent | 60851d7a81138ba3546dde044a8d629c1f603525 (diff) | |
| download | talos-op-linux-eeec0434e8b89fa5f29d71e5f8044dcec7939d1a.tar.gz talos-op-linux-eeec0434e8b89fa5f29d71e5f8044dcec7939d1a.zip | |
Merge tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek into next/soc
Merge "ARM: mediatek: soc changes for v3.20" from Matthias Brugger:
This adds config options for the different Mediatek SoC. We need this so that
the pinctrl driver does not bloat the kernel binary.
Apart we change the Kconfig description and add the config option for mt6592
low-level debug option.
* tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek:
ARM: mediatek: Low-level-debug for mt6592
ARM: mediatek: Add config options for mediatek SoCs.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index dc2b768edb8a..e902cedbb2dc 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1011,7 +1011,7 @@ choice for Mediatek mt6589 based platforms on UART0. config DEBUG_MT8127_UART0 - bool "Mediatek mt8127 UART0" + bool "Mediatek mt8127/mt6592 UART0" depends on ARCH_MEDIATEK select DEBUG_UART_8250 help |
