arm64: defconfig: fix override warning of MMC_BLOCK_MINORS

Message ID 1458533284-23010-1-git-send-email-wangkefeng.wang@huawei.com
State New
Headers show

Commit Message

Kefeng Wang March 21, 2016, 4:08 a.m.
The commit 2f85bb09d95e ("arm64: defconfig: Increase MMC_BLOCK_MINORS to
16") and commit 22b0898e831b ("arm64: add defconfig options for Allwinner
SoCs") both add MMC_BLOCK_MINORS to defconfig, which leads to override
warning, fix it.

Cc: Georgi Djakov <georgi.djakov@linaro.org>
Cc: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

---
 arch/arm64/configs/defconfig | 1 -
 1 file changed, 1 deletion(-)

-- 
1.7.12.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Comments

Will Deacon March 22, 2016, 10:23 a.m. | #1
On Tue, Mar 22, 2016 at 10:15:40AM +0000, Andre Przywara wrote:
> (Adding Will, who usually takes care of this)


Gah, I don't usually take care of this! As I said before, I just pick
up the bits and pieces that are left at -rc1. The more than can be merged
through arm-soc, the better.

> On 21/03/16 04:08, Kefeng Wang wrote:

> > The commit 2f85bb09d95e ("arm64: defconfig: Increase MMC_BLOCK_MINORS to

> > 16") and commit 22b0898e831b ("arm64: add defconfig options for Allwinner

> > SoCs") both add MMC_BLOCK_MINORS to defconfig, which leads to override

> > warning, fix it.

> 

> Looks good to me.

> 

> Will, do you just want to fix it up with your defconfig update planned

> for after -rc1 anyway?


I'll try to make sure that it doesn't fall on the floor.

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Patch

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f705051..3ad26ff 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -215,7 +215,6 @@  CONFIG_MMC_SPI=y
 CONFIG_MMC_SUNXI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_EXYNOS=y
-CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_SYSCON=y