[go: nahoru, domu]

Revert "CHROMIUM: Renormalize after iwl7000 Kconfig changes"

This reverts commit a2fcd62602b8ae6406adc900a653676f91b06d86.
Core31 update to the iwl7000 driver pulled in an iwl7000-specific
implementation of cfg80211, iwl7000_cfg80211.ko, which provides the
same functionality as cfg80211.ko and cannot co-exist with it.
cfg80211.ko was disabled on Intel systems.
Core35 restores the iwl7000 driver to using stock cfg80211, so re-add
the iwl7000->cfg80211 and related dependencies, make sure iwl7000 and other
wifi modules can co-exist on pineview configs.

CQ-DEPEND=CL:1006654
BUG=b:76340244
TEST=build and boot on meowth

Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1012533
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
(cherry picked from commit 2532e431e5aca37a83382eef5526685d6e20a062)

Change-Id: If655533c3b397a561a9f69c82dd0a0ea34dffc12
Reviewed-on: https://chromium-review.googlesource.com/1016014
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
7 files changed