summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-05-16 21:47:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-16 13:17:52 -0700
commitdd4f521399d059b9c42e95a42c5373e10d14c0c6 (patch)
tree0b3ebcbac315322451c6c6f6099c978165f8546c /drivers/staging
parent00bf19f31527f73caf1e9e1d8104404961ebe798 (diff)
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 <geert@linux-m68k.org> Cc: Sage Ahn <syahn@gctsemi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/gdm72xx/Kconfig2
-rw-r--r--drivers/staging/gdm72xx/gdm_usb.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/gdm72xx/Kconfig b/drivers/staging/gdm72xx/Kconfig
index 5c37cba11486..fc584271325c 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 004786bae577..f60e890c65c8 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -17,12 +17,6 @@
#include <linux/usb.h>
#include <asm/byteorder.h>
-#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"