diff options
| author | merge <null@invalid> | 2008-12-08 13:32:44 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-08 13:32:44 +0000 |
| commit | 9402b27b2a497f8eeb72f6fe1045f2c5be800fe2 (patch) | |
| tree | e34009d4eb6fa74972316bf2c762b255c4aaa037 /arch | |
| parent | c3be736aeb24f44cf95dfad8fe3f1c7c6f367aaf (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-touchscreen-group-patch-1228735176
pending-tracking-hist top was MERGE-via-stable-tracking-config-touchscreen-group-patch-1228735176 / b0d334ee992b56e9c97422bcb7d3d4fe239af53e ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-config-touchscreen-group-patch
stable-tracking-hist top was config-touchscreen-group-patch / 51c9b7258ee85644ada4b8bf1db4da2450585675 ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
config-touchscreen-group.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/gta02-moredrivers-defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/gta03_defconfig | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index fbaf760e4fa..52160fe40b0 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 -# Wed Dec 3 13:42:20 2008 +# Mon Dec 8 11:17:01 2008 # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/arch/arm/configs/gta03_defconfig b/arch/arm/configs/gta03_defconfig index 1d0a189d0b6..b8f3de0862c 100644 --- a/arch/arm/configs/gta03_defconfig +++ b/arch/arm/configs/gta03_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-rc4 -# Wed Dec 3 11:24:46 2008 +# Mon Dec 8 11:18:27 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -182,9 +182,9 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y # # Power management # -CONFIG_S3C2410_PM_DEBUG=y -CONFIG_S3C2410_PM_CHECK=y -CONFIG_S3C2410_PM_CHECK_CHUNKSIZE=64 +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C_PM_DEBUG_LED_SMDK is not set +# CONFIG_S3C2410_PM_CHECK is not set CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C_GPIO_SPACE=0 CONFIG_S3C_GPIO_TRACK=y |