diff options
-rw-r--r-- | arch/arm/configs/bcm_defconfig | 3 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 2 |
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 | |||
29 | CONFIG_ARM_THUMBEE=y | 29 | CONFIG_ARM_THUMBEE=y |
30 | CONFIG_PREEMPT=y | 30 | CONFIG_PREEMPT=y |
31 | CONFIG_AEABI=y | 31 | CONFIG_AEABI=y |
32 | # CONFIG_OABI_COMPAT is not set | ||
33 | # CONFIG_COMPACTION is not set | 32 | # CONFIG_COMPACTION is not set |
34 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 33 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
35 | CONFIG_ZBOOT_ROM_BSS=0x0 | 34 | CONFIG_ZBOOT_ROM_BSS=0x0 |
36 | CONFIG_ARM_APPENDED_DTB=y | ||
37 | CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M" | 35 | CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M" |
38 | CONFIG_CPU_IDLE=y | 36 | CONFIG_CPU_IDLE=y |
39 | CONFIG_VFP=y | 37 | CONFIG_VFP=y |
@@ -120,6 +118,7 @@ CONFIG_DETECT_HUNG_TASK=y | |||
120 | CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110 | 118 | CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110 |
121 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y | 119 | CONFIG_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 | ||
123 | CONFIG_CRC_CCITT=y | 122 | CONFIG_CRC_CCITT=y |
124 | CONFIG_CRC_T10DIF=y | 123 | CONFIG_CRC_T10DIF=y |
125 | CONFIG_CRC_ITU_T=y | 124 | CONFIG_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 | |||
25 | obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o | 25 | obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o |
26 | obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o | 26 | obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o |
27 | obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o | 27 | obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o |
28 | obj-$(CONFIG_ARCH_BCM) += bcm_kona_timer.o | 28 | obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm_kona_timer.o |
29 | obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o | 29 | obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o |
30 | obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o | 30 | obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o |
31 | obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o | 31 | obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o |