diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
| commit | af90aa3080dd6af491f0131165a58beedb9e6217 (patch) | |
| tree | d4a76180397fd7c2dd3c6ef6060bdc55be37cbe1 /arch/arm/configs/cyanogenmod_i9300_defconfig | |
| parent | 4fb23ca1a553ad49a02e0fffc0474f615a72660e (diff) | |
| parent | be3d845ee40c30b52b56a7fb44013674ccab03fd (diff) | |
| download | kernel_samsung_smdk4412-af90aa3080dd6af491f0131165a58beedb9e6217.zip kernel_samsung_smdk4412-af90aa3080dd6af491f0131165a58beedb9e6217.tar.gz kernel_samsung_smdk4412-af90aa3080dd6af491f0131165a58beedb9e6217.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0replicant-6.0-alpha-0002replicant-6.0-old
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
usr/galaxys2_initramfs_files/init
Diffstat (limited to 'arch/arm/configs/cyanogenmod_i9300_defconfig')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9300_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig index 2743d3a..a493382 100644 --- a/arch/arm/configs/cyanogenmod_i9300_defconfig +++ b/arch/arm/configs/cyanogenmod_i9300_defconfig @@ -712,7 +712,6 @@ CONFIG_CMDLINE_EXTEND=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_HAS_BLUETOOTH_DEADLOCKS=y CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set |