aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/bcm_defconfig3
-rw-r--r--drivers/clocksource/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 287ac1d7aac7..7a8564e0303f 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -29,11 +29,9 @@ CONFIG_ARCH_BCM_MOBILE=y
29CONFIG_ARM_THUMBEE=y 29CONFIG_ARM_THUMBEE=y
30CONFIG_PREEMPT=y 30CONFIG_PREEMPT=y
31CONFIG_AEABI=y 31CONFIG_AEABI=y
32# CONFIG_OABI_COMPAT is not set
33# CONFIG_COMPACTION is not set 32# CONFIG_COMPACTION is not set
34CONFIG_ZBOOT_ROM_TEXT=0x0 33CONFIG_ZBOOT_ROM_TEXT=0x0
35CONFIG_ZBOOT_ROM_BSS=0x0 34CONFIG_ZBOOT_ROM_BSS=0x0
36CONFIG_ARM_APPENDED_DTB=y
37CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M" 35CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M"
38CONFIG_CPU_IDLE=y 36CONFIG_CPU_IDLE=y
39CONFIG_VFP=y 37CONFIG_VFP=y
@@ -120,6 +118,7 @@ CONFIG_DETECT_HUNG_TASK=y
120CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110 118CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110
121CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y 119CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
122# CONFIG_FTRACE is not set 120# CONFIG_FTRACE is not set
121# CONFIG_CRYPTO_ANSI_CPRNG is not set
123CONFIG_CRC_CCITT=y 122CONFIG_CRC_CCITT=y
124CONFIG_CRC_T10DIF=y 123CONFIG_CRC_T10DIF=y
125CONFIG_CRC_ITU_T=y 124CONFIG_CRC_ITU_T=y
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 33621efb9148..1f42e8f0d7c2 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o
25obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o 25obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o
26obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o 26obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o
27obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o 27obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o
28obj-$(CONFIG_ARCH_BCM) += bcm_kona_timer.o 28obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm_kona_timer.o
29obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o 29obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
30obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o 30obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o
31obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o 31obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o