projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11e1ef2)
omap: rx51_defconfig: Remove duplicate phonet
authorJarkko Nikula <jhnikula@gmail.com>
Mon, 19 Apr 2010 13:52:09 +0000 (13:52 +0000)
committerTony Lindgren <tony@atomide.com>
Fri, 23 Apr 2010 22:35:11 +0000 (15:35 -0700)
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>
arch/arm/configs/rx51_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig
index 45135ffadc57d4532ca8985911566174b5ff8c02..cc6a32a80c94cb1ba1af91ec127eeee8aed94d8d 100644 (file)
--- 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