diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-04-19 09:52:09 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-23 18:35:11 -0400 |
| commit | c8fa4d2738bc747e417a220e6ceb21e8c148266f (patch) | |
| tree | 4db62a7289df8091a8bf5183c631dd14dddcb8f8 /arch/arm/configs/rx51_defconfig | |
| parent | 11e1ef2d105900a302b7ca92bcaf96a96d0274a1 (diff) | |
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/arm/configs/rx51_defconfig')
| -rw-r--r-- | arch/arm/configs/rx51_defconfig | 1 |
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 | |||
| 480 | # CONFIG_BT_HCIBFUSB is not set | 480 | # CONFIG_BT_HCIBFUSB is not set |
| 481 | # CONFIG_BT_HCIVHCI is not set | 481 | # CONFIG_BT_HCIVHCI is not set |
| 482 | # CONFIG_AF_RXRPC is not set | 482 | # CONFIG_AF_RXRPC is not set |
| 483 | # CONFIG_PHONET is not set | ||
| 484 | CONFIG_WIRELESS=y | 483 | CONFIG_WIRELESS=y |
| 485 | CONFIG_CFG80211=y | 484 | CONFIG_CFG80211=y |
| 486 | # CONFIG_CFG80211_REG_DEBUG is not set | 485 | # CONFIG_CFG80211_REG_DEBUG is not set |