diff --git a/[refs] b/[refs] index 1fe832bfa53f..f0607fd8f39b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00bf19f31527f73caf1e9e1d8104404961ebe798 +refs/heads/master: dd4f521399d059b9c42e95a42c5373e10d14c0c6 diff --git a/trunk/drivers/staging/gdm72xx/Kconfig b/trunk/drivers/staging/gdm72xx/Kconfig index 5c37cba11486..fc584271325c 100644 --- a/trunk/drivers/staging/gdm72xx/Kconfig +++ b/trunk/drivers/staging/gdm72xx/Kconfig @@ -38,7 +38,7 @@ if WIMAX_GDM72XX_USB config WIMAX_GDM72XX_USB_PM bool "Enable power managerment support" - default n + depends on USB_SUSPEND endif # WIMAX_GDM72XX_USB diff --git a/trunk/drivers/staging/gdm72xx/gdm_usb.c b/trunk/drivers/staging/gdm72xx/gdm_usb.c index 004786bae577..f60e890c65c8 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_usb.c +++ b/trunk/drivers/staging/gdm72xx/gdm_usb.c @@ -17,12 +17,6 @@ #include #include -#ifdef CONFIG_WIMAX_GDM72XX_USB_PM -#ifndef CONFIG_USB_SUSPEND -#error "USB host doesn't support USB Selective Suspend." -#endif -#endif - #include "gdm_usb.h" #include "gdm_wimax.h" #include "usb_boot.h"