aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authormerge <null@invalid>2008-12-03 13:45:22 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-03 13:45:22 +0000
commit39b50f00280677f59f0c15f187a3844c92be7b8f (patch)
tree9c72a33c2d38b775ad33ff344ba52d48c90b26ed /arch/arm/configs
parent717c56b58e9853d095c6e529a3730fe77309a519 (diff)
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 <null@invalid> 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 <andy@openmoko.com> config-gta02-uplevel-s3c-fifo-option.patch Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/gta02-moredrivers-defconfig3
1 files changed, 2 insertions, 1 deletions
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