From 39b50f00280677f59f0c15f187a3844c92be7b8f Mon Sep 17 00:00:00 2001 From: merge Date: Wed, 3 Dec 2008 13:45:22 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-gta02-uplevel-s3c-fifo-1228311801 pending-tracking-hist top was MERGE-via-stable-tracking-config-gta02-uplevel-s3c-fifo-1228311801 / 45e034c117209b4b983559b3cc9324988cb74cae ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-config-gta02-uplevel-s3c-fifo- stable-tracking-hist top was config-gta02-uplevel-s3c-fifo- / c33ca63570576d6ef09f7b84d12ec124af08ea6e ... parent commitmessage: From: Andy Green config-gta02-uplevel-s3c-fifo-option.patch Signed-off-by: Andy Green --- arch/arm/configs/gta02-moredrivers-defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index fd9cfc91821..b11a50fce75 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-rc4 -# Fri Nov 28 10:03:49 2008 +# Wed Dec 3 13:42:20 2008 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -185,6 +185,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y # # CONFIG_S3C_BOOT_WATCHDOG is not set # CONFIG_S3C_BOOT_ERROR_RESET is not set +CONFIG_S3C_BOOT_UART_FORCE_FIFO=y # # Power management -- cgit v1.2.3