diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-04-04 11:50:27 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-04 12:53:36 +0200 |
| commit | ceed3b07f950118e40a880b585ddd7236a83a832 (patch) | |
| tree | 252568982f9161d9b59ce514b237636f6a45216f | |
| parent | 702a5ca55410f62ac01d86ee46a319950770bf7d (diff) | |
LINARO: CONFIG: Config fallout from updateconfigs
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index b4cce18e5f4..d73563647f5 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -461,15 +461,20 @@ CONFIG_CW1200=m # CONFIG_CW1200_5GHZ_SUPPORT is not set # CONFIG_CW1200_BH_DEBUG is not set CONFIG_CW1200_DEBUGFS=y +# CONFIG_CW1200_DISABLE_BEACON_HINTS is not set +# CONFIG_CW1200_DUMP_ON_ERROR is not set +# CONFIG_CW1200_ITP is not set # CONFIG_CW1200_NON_POWER_OF_TWO_BLOCKSIZES is not set # CONFIG_CW1200_STA_DEBUG is not set # CONFIG_CW1200_TXRX_DEBUG is not set # CONFIG_CW1200_TX_POLICY_DEBUG is not set # CONFIG_CW1200_U5500_SUPPORT is not set CONFIG_CW1200_USE_GPIO_IRQ=y +# CONFIG_CW1200_USE_STE_EXTENSIONS is not set # CONFIG_CW1200_WAPI_SUPPORT is not set # CONFIG_CW1200_WSM_DEBUG is not set # CONFIG_CW1200_WSM_DUMPS is not set +# CONFIG_CW1200_WSM_DUMPS_SHORT is not set # CONFIG_DAVICOM_PHY is not set CONFIG_DB8500_MLOADER=y CONFIG_DBX500_MLOADER=y @@ -1514,7 +1519,7 @@ CONFIG_PHYLIB=y # CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PL310_ERRATA_588369 is not set # CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_PL310_ERRATA_753970 is not set +CONFIG_PL310_ERRATA_753970=y # CONFIG_PL310_ERRATA_769419 is not set # CONFIG_PL330_DMA is not set CONFIG_PLAT_NOMADIK=y @@ -1964,6 +1969,7 @@ CONFIG_SPI_PL022=y # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI_WORKQUEUE is not set # CONFIG_SPI_XILINX is not set CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_SQUASHFS is not set @@ -1980,6 +1986,8 @@ CONFIG_STE_DMA40=y CONFIG_STE_TRACE_MODEM=y CONFIG_STLC2690_CHIP=y # CONFIG_STMMAC_ETH is not set +CONFIG_STM_MSP_SPI=y +# CONFIG_STM_TRACE is not set CONFIG_STOP_MACHINE=y CONFIG_STRICT_DEVMEM=y # CONFIG_STRIP_ASM_SYMS is not set @@ -2313,7 +2321,6 @@ CONFIG_USB_ZERO=m # CONFIG_USB_ZR364XX is not set 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_DB_DUMP=y # CONFIG_UX500_DEBUG_HWREG is not set @@ -2326,11 +2333,7 @@ CONFIG_UX500_SOC_COMMON=y # CONFIG_UX500_SOC_DB5500 is not set CONFIG_UX500_SOC_DB8500=y CONFIG_UX500_SOC_DBX500=y -#CONFIG_UX500_SUSPEND is not set -CONFIG_UX500_SUSPEND_DBG=y -CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y -CONFIG_UX500_SUSPEND_MEM=y -CONFIG_UX500_SUSPEND_STANDBY=y +# CONFIG_UX500_SUSPEND is not set CONFIG_UX500_WATCHDOG=y CONFIG_UX500_WATCHDOG_DEBUG=y # CONFIG_V4L_MEM2MEM_DRIVERS is not set |