From ac224fe12b9e58abb62ef6ec87d7d09981b2b13a Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 15 Jul 2011 12:54:00 +0100 Subject: DELTA: LINARO: CONFIG: Some little tweaks and updates Signed-off-by: Lee Jones --- debian.linaro/config/config.common.ubuntu | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index 23b67d40072..2dd780f538a 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -504,6 +504,7 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_DISPLAY_AB8500_TERTIARY is not set CONFIG_DISPLAY_AV8100_TERTIARY=y # CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER is not set +# CONFIG_DISPLAY_FICTIVE is not set CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_AUTO_SYNC=y # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_0 is not set @@ -1182,6 +1183,7 @@ CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_USHC is not set CONFIG_MMU=y +# CONFIG_MODEM is not set CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set # CONFIG_MODULE_FORCE_UNLOAD is not set @@ -1718,7 +1720,6 @@ CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y # CONFIG_SGI_PARTITION is not set CONFIG_SHMEM=y -CONFIG_SHRM_V1_UPDATES_VERSION=y # CONFIG_SIGMATEL_FIR is not set CONFIG_SIGNALFD=y CONFIG_SLAB=y @@ -1912,14 +1913,10 @@ CONFIG_U5500_MBOX=y CONFIG_U5500_MODEM_IRQ=y # CONFIG_U8500_ACODEC is not set # CONFIG_U8500_CM is not set -CONFIG_U8500_CPUFREQ=y # CONFIG_U8500_FLASH is not set # CONFIG_U8500_MMIO is not set # CONFIG_U8500_REGULATOR_DEBUG is not set # CONFIG_U8500_SECURE is not set -CONFIG_U8500_SHRM=y -# CONFIG_U8500_SHRM_LOOP_BACK is not set -CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y # CONFIG_UACCESS_WITH_MEMCPY is not set # CONFIG_UDF_FS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" @@ -2017,7 +2014,7 @@ CONFIG_USB_MON=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_USB_MUSB_HOST is not set -CONFIG_USB_MUSB_OTG=y +# CONFIG_USB_MUSB_OTG is not set # CONFIG_USB_MUSB_PERIPHERAL is not set CONFIG_USB_MUSB_UX500=y # CONFIG_USB_NET_RNDIS_WLAN is not set @@ -2072,6 +2069,7 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_USE_OF is not set CONFIG_UX500_CONSOLE_UART_GPIO_PIN=29 CONFIG_UX500_CONTEXT=y +CONFIG_UX500_CPUFREQ=y # CONFIG_UX500_DEBUG_HWREG is not set # CONFIG_UX500_DEBUG_NO_LAUTERBACH is not set CONFIG_UX500_DEBUG_UART=2 @@ -2089,6 +2087,8 @@ CONFIG_UX500_SUSPEND_DBG=y CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y # CONFIG_UX500_SUSPEND_MEM is not set CONFIG_UX500_SUSPEND_STANDBY=y +CONFIG_UX500_WATCHDOG=y +# CONFIG_UX500_WATCHDOG_DEBUG is not set # CONFIG_V4L_MEM2MEM_DRIVERS is not set CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VETH is not set -- cgit v1.2.3