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 | |
| parent | 4fb23ca1a553ad49a02e0fffc0474f615a72660e (diff) | |
| parent | be3d845ee40c30b52b56a7fb44013674ccab03fd (diff) | |
| download | kernel_samsung_smdk4412-replicant-6.0-old.zip kernel_samsung_smdk4412-replicant-6.0-old.tar.gz kernel_samsung_smdk4412-replicant-6.0-old.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')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_d710_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i777_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9100_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9300_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_n7000_defconfig | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/configs/cyanogenmod_d710_defconfig b/arch/arm/configs/cyanogenmod_d710_defconfig index c396f95..e5945d3 100644 --- a/arch/arm/configs/cyanogenmod_d710_defconfig +++ b/arch/arm/configs/cyanogenmod_d710_defconfig @@ -2493,7 +2493,7 @@ CONFIG_MMC_EMBEDDED_SDIO=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=12 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set diff --git a/arch/arm/configs/cyanogenmod_i777_defconfig b/arch/arm/configs/cyanogenmod_i777_defconfig index b3969ee..49d5e4d 100644 --- a/arch/arm/configs/cyanogenmod_i777_defconfig +++ b/arch/arm/configs/cyanogenmod_i777_defconfig @@ -2522,7 +2522,7 @@ CONFIG_MMC_EMBEDDED_SDIO=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=12 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set diff --git a/arch/arm/configs/cyanogenmod_i9100_defconfig b/arch/arm/configs/cyanogenmod_i9100_defconfig index 5804d5b..1fe48b3 100644 --- a/arch/arm/configs/cyanogenmod_i9100_defconfig +++ b/arch/arm/configs/cyanogenmod_i9100_defconfig @@ -2521,7 +2521,7 @@ CONFIG_MMC_EMBEDDED_SDIO=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=12 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set 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 diff --git a/arch/arm/configs/cyanogenmod_n7000_defconfig b/arch/arm/configs/cyanogenmod_n7000_defconfig index 7e233d1..0ac33a0 100644 --- a/arch/arm/configs/cyanogenmod_n7000_defconfig +++ b/arch/arm/configs/cyanogenmod_n7000_defconfig @@ -2541,7 +2541,7 @@ CONFIG_MMC_PARANOID_SD_INIT=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=12 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set |