aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-01-24 16:50:32 +0000
committerArnd Bergmann <arnd@arndb.de>2013-02-14 15:04:35 +0100
commitbb57d4e3220544feee1e4bc02c62dd4f78c444c8 (patch)
tree1d47fc1815388bd95e9d4e573655ae3097d26292 /arch/arm/configs
parentARM: w90x900: fix legacy assembly syntax (diff)
downloadlinux-dev-bb57d4e3220544feee1e4bc02c62dd4f78c444c8.tar.xz
linux-dev-bb57d4e3220544feee1e4bc02c62dd4f78c444c8.zip
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
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/marzen_defconfig1
1 files changed, 0 insertions, 1 deletions
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