@@ -14,7 +14,6 @@ CONFIG_AUDIT_ARCH=y
CONFIG_BCH=m
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_IDLE_CALXEDA is not set
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DM_RAID45=m
@@ -83,7 +82,6 @@ CONFIG_SOUND=m
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPI_PXA2XX_PCI=m
# CONFIG_STANDALONE is not set
-# CONFIG_SWP_EMULATE is not set
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_CHIPIDEA=m
CONFIG_USB_EHCI_HCD_PLATFORM=y
@@ -9,7 +9,6 @@ CONFIG_ASYNC_TX_DMA=y
CONFIG_BCH=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_IDLE_CALXEDA=y
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DM_RAID45 is not set
@@ -75,7 +74,6 @@ CONFIG_SND_TIMER=y
CONFIG_SOUND=y
# CONFIG_SPI_PXA2XX_PCI is not set
CONFIG_STANDALONE=y
-CONFIG_SWP_EMULATE=y
# CONFIG_USB_ARCH_HAS_XHCI is not set
CONFIG_USB_CHIPIDEA=y
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -370,7 +370,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
# CONFIG_ARM_LPAE is not set
CONFIG_ARM_NR_BANKS=8
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_THUMB=y
@@ -1103,6 +1103,7 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_HAS_ASID=y
# CONFIG_CPU_ICACHE_DISABLE is not set
CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_CALXEDA=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
@@ -5698,6 +5699,7 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
CONFIG_SWIOTLB_XEN=y
+CONFIG_SWP_EMULATE=y
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
CONFIG_SYNCLINK_CS=m
@@ -13,7 +13,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_BCH=m
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_IDLE_CALXEDA is not set
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_DM_RAID45=m
@@ -82,7 +81,6 @@ CONFIG_SOUND=m
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_SPI_PXA2XX_PCI=m
# CONFIG_STANDALONE is not set
-# CONFIG_SWP_EMULATE is not set
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_CHIPIDEA=m
CONFIG_USB_EHCI_HCD_PLATFORM=y
More info here: https://lkml.org/lkml/2013/1/27/114 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/config.common.ubuntu | 4 +++- debian.master/config/i386/config.common.i386 | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-)