diff options
| author | Greg Kroah-Hartman | 2013-05-27 03:54:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-05-27 03:54:33 +0200 |
| commit | 829455bb0e994373519e3c58d403fc1148f44630 (patch) | |
| tree | 7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a /drivers/staging/gdm72xx | |
| parent | staging: ozwpan: Revert last changes (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | kernel-qcow2-linux-829455bb0e994373519e3c58d403fc1148f44630.tar.gz kernel-qcow2-linux-829455bb0e994373519e3c58d403fc1148f44630.tar.xz kernel-qcow2-linux-829455bb0e994373519e3c58d403fc1148f44630.zip | |
Merge 3.10-rc3 into staging-next
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm72xx')
| -rw-r--r-- | drivers/staging/gdm72xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gdm72xx/Kconfig b/drivers/staging/gdm72xx/Kconfig index 3c18efe31365..69059138de4a 100644 --- a/drivers/staging/gdm72xx/Kconfig +++ b/drivers/staging/gdm72xx/Kconfig @@ -39,7 +39,7 @@ if WIMAX_GDM72XX_USB config WIMAX_GDM72XX_USB_PM bool "Enable power managerment support" - depends on USB_SUSPEND + depends on PM_RUNTIME endif # WIMAX_GDM72XX_USB |