projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fa5ce5f)
ARM: shmobile: fix defconfig warning on CONFIG_USB
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Jan 2013 16:50:32 +0000 (16:50 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Feb 2013 14:04:35 +0000 (15:04 +0100)
A recent update to the marzen_defconfig introduced a
duplicate CONFIG_USB=y line. This removes one of the
two.

arch/arm/configs/marzen_defconfig:86:warning: override: reassigning to symbol USB

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Cc: linux-sh@vger.kernel.org
arch/arm/configs/marzen_defconfig patch | blob | history

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 728a43c446f8a5e2acd25f66ae03c2bd867fa0fb..afb17d630d4444563a76e30007fa369ca6a08c53 100644 (file)
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -83,7 +83,6 @@ CONFIG_USB=y
 CONFIG_USB_RCAR_PHY=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
-CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
John Crispins staging tree