diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:40:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:40:15 -0500 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/Kconfig.debug | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (diff) | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 (diff) | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
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 5cb9326df7a7..91344af75f39 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -117,7 +117,7 @@ config DEBUG_CLPS711X_UART2 | |||
| 117 | cause the debug messages to appear on the first serial port. | 117 | cause the debug messages to appear on the first serial port. |
| 118 | 118 | ||
| 119 | config DEBUG_S3C_UART | 119 | config DEBUG_S3C_UART |
| 120 | depends on PLAT_S3C | 120 | depends on PLAT_SAMSUNG |
| 121 | int "S3C UART to use for low-level debug" | 121 | int "S3C UART to use for low-level debug" |
| 122 | default "0" | 122 | default "0" |
| 123 | help | 123 | help |