From: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon, 19 Apr 2010 13:52:09 +0000 (+0000)
Subject: omap: rx51_defconfig: Remove duplicate phonet
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c8fa4d2738bc747e417a220e6ceb21e8c148266f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

omap: rx51_defconfig: Remove duplicate phonet

Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42
and this duplicate gives a warning when doing make rx51_defconfig.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig
index 45135ffadc57..cc6a32a80c94 100644
--- a/arch/arm/configs/rx51_defconfig
+++ b/arch/arm/configs/rx51_defconfig
@@ -480,7 +480,6 @@ CONFIG_BT_HIDP=m
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 # CONFIG_CFG80211_REG_DEBUG is not set