From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 24 Jan 2013 16:50:32 +0000 (+0000)
Subject: ARM: shmobile: fix defconfig warning on CONFIG_USB
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb57d4e3220544feee1e4bc02c62dd4f78c444c8;p=linux-beck.git

ARM: shmobile: fix defconfig warning on CONFIG_USB

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
---

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 728a43c446f8..afb17d630d44 100644
--- 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