From dd4f521399d059b9c42e95a42c5373e10d14c0c6 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 16 May 2012 21:47:40 +0200 Subject: [PATCH] staging: gdm72xx: WIMAX_GDM72XX_USB_PM should depend on USB_SUSPEND Use Kconfig logic instead of a rude #error in the driver source, which breaks m68k-allmodconfig. Also remove the "default n", as that's the default. Signed-off-by: Geert Uytterhoeven Cc: Sage Ahn Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gdm72xx/Kconfig | 2 +- drivers/staging/gdm72xx/gdm_usb.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/gdm72xx/Kconfig b/drivers/staging/gdm72xx/Kconfig index 5c37cba..fc58427 100644 --- a/drivers/staging/gdm72xx/Kconfig +++ b/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/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 004786b..f60e890 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/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" -- 2.7.4