diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 07:11:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 07:11:52 -0400 |
| commit | 346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8 (patch) | |
| tree | 0e824d68b72969127abcad85e82b468ed4e23237 /drivers/net/wireless/iwlwifi/dvm/power.c | |
| parent | 5caf6ae5ce880ec15448b310e47a9515ebb7e808 (diff) | |
| parent | 4f0eb5d7efe375859b15c97f453113a242bf057b (diff) | |
Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
Adds 3 new PHY drivers stih407, stih41x and rcar gen2 PHY. It also
includes miscellaneous cleanup of other PHY drivers.
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/power.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/power.c b/drivers/net/wireless/iwlwifi/dvm/power.c index 760c45c34ef3..1513dbc79c14 100644 --- a/drivers/net/wireless/iwlwifi/dvm/power.c +++ b/drivers/net/wireless/iwlwifi/dvm/power.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include "commands.h" | 40 | #include "commands.h" |
| 41 | #include "power.h" | 41 | #include "power.h" |
| 42 | 42 | ||
| 43 | static bool force_cam; | 43 | static bool force_cam = true; |
| 44 | module_param(force_cam, bool, 0644); | 44 | module_param(force_cam, bool, 0644); |
| 45 | MODULE_PARM_DESC(force_cam, "force continuously aware mode (no power saving at all)"); | 45 | MODULE_PARM_DESC(force_cam, "force continuously aware mode (no power saving at all)"); |
| 46 | 46 | ||