diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-01-24 11:50:32 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 09:04:35 -0500 |
| commit | bb57d4e3220544feee1e4bc02c62dd4f78c444c8 (patch) | |
| tree | 1d47fc1815388bd95e9d4e573655ae3097d26292 | |
| parent | fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e (diff) | |
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
| -rw-r--r-- | arch/arm/configs/marzen_defconfig | 1 |
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 | |||
| 83 | CONFIG_USB_RCAR_PHY=y | 83 | CONFIG_USB_RCAR_PHY=y |
| 84 | CONFIG_MMC=y | 84 | CONFIG_MMC=y |
| 85 | CONFIG_MMC_SDHI=y | 85 | CONFIG_MMC_SDHI=y |
| 86 | CONFIG_USB=y | ||
| 87 | CONFIG_USB_EHCI_HCD=y | 86 | CONFIG_USB_EHCI_HCD=y |
| 88 | CONFIG_USB_OHCI_HCD=y | 87 | CONFIG_USB_OHCI_HCD=y |
| 89 | CONFIG_USB_OHCI_HCD_PLATFORM=y | 88 | CONFIG_USB_OHCI_HCD_PLATFORM=y |