Skip to content

Commit

Permalink
Merge tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
  • Loading branch information
olofj committed Apr 3, 2015
2 parents 3726767 + dc344b6 commit a6964d9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/configs/qcom_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=16
CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_ARMMMCI=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
Expand Down

0 comments on commit a6964d9

Please sign in to comment.