summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-04-19 15:52:09 +0200
committerTony Lindgren <tony@atomide.com>2010-04-24 00:35:11 +0200
commitc8fa4d2738bc747e417a220e6ceb21e8c148266f (patch)
tree4db62a7289df8091a8bf5183c631dd14dddcb8f8 /arch
parentomap: fix a gpmc nand problem (diff)
downloadlinux-c8fa4d2738bc747e417a220e6ceb21e8c148266f.tar.xz
linux-c8fa4d2738bc747e417a220e6ceb21e8c148266f.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/rx51_defconfig1
1 files changed, 0 insertions, 1 deletions
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