diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 16:23:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 16:23:33 -0400 |
| commit | a6964d90fe54ac0a5c610fea0f5b6f6608c22b2a (patch) | |
| tree | 7dc331b9de88be49bb0f23f7fcf8e01a1cc46acb /arch/arm | |
| parent | 37267675c9f0037b550d6c4c253a669fb728dfe5 (diff) | |
| parent | dc344b62121c4e2ba5bd9d5bf7a2b4ce5f0487ce (diff) | |
Merge tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig
Merge "qcom defconfig changes for 4.1-1" from Kumar Gala:
Qualcomm ARM Based defconfig Updates for v4.1-1
* Increase MMC_BLOCK_MINORS to 32 since qcom platforms have more than
16 partitions
* tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 2de999338df0..d2f2babfd47a 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig | |||
| @@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y | |||
| 125 | CONFIG_USB_GADGET_DEBUG_FILES=y | 125 | CONFIG_USB_GADGET_DEBUG_FILES=y |
| 126 | CONFIG_USB_GADGET_VBUS_DRAW=500 | 126 | CONFIG_USB_GADGET_VBUS_DRAW=500 |
| 127 | CONFIG_MMC=y | 127 | CONFIG_MMC=y |
| 128 | CONFIG_MMC_BLOCK_MINORS=16 | 128 | CONFIG_MMC_BLOCK_MINORS=32 |
| 129 | CONFIG_MMC_ARMMMCI=y | 129 | CONFIG_MMC_ARMMMCI=y |
| 130 | CONFIG_MMC_SDHCI=y | 130 | CONFIG_MMC_SDHCI=y |
| 131 | CONFIG_MMC_SDHCI_PLTFM=y | 131 | CONFIG_MMC_SDHCI_PLTFM=y |