From 0a155e861e92358d9ca1aa437fa91de2c7890534 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 16 May 2012 21:47:40 +0200 Subject: [PATCH] --- yaml --- r: 304735 b: refs/heads/master c: dd4f521399d059b9c42e95a42c5373e10d14c0c6 h: refs/heads/master i: 304733: 7791ee1e2c03eff17238437f27894fe0d8ed198f 304731: 4299233c34d642b2cfc9feaec90518e90236fce0 304727: 5f80bdcb4f9bff5df02b8de0e99c16f07e18f475 304719: 29df0baedfc55b8d8c36761049cb49d75e13a330 304703: 93430ed9e5862ca0803c67507348e25dd34d84ec v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/Kconfig | 2 +- trunk/drivers/staging/gdm72xx/gdm_usb.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) 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"