diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/arm/Kconfig.debug | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
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 5d3acff8c596..d22f38b957db 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -101,7 +101,7 @@ config DEBUG_S3C2410_UART | |||
| 101 | help | 101 | help |
| 102 | Choice for UART for kernel low-level using S3C2410 UARTS, | 102 | Choice for UART for kernel low-level using S3C2410 UARTS, |
| 103 | should be between zero and two. The port must have been | 103 | should be between zero and two. The port must have been |
| 104 | initalised by the boot-loader before use. | 104 | initialised by the boot-loader before use. |
| 105 | 105 | ||
| 106 | The uncompressor code port configuration is now handled | 106 | The uncompressor code port configuration is now handled |
| 107 | by CONFIG_S3C2410_LOWLEVEL_UART_PORT. | 107 | by CONFIG_S3C2410_LOWLEVEL_UART_PORT. |