Title: [9035] trunk/arch/blackfin: rollback to r9033, deleted the unneeded
- Revision
- 9035
- Author
- lliubbo
- Date
- 2010-08-02 02:44:20 -0400 (Mon, 02 Aug 2010)
Log Message
rollback to r9033, deleted the unneeded
"Add hibernate wakeup from USB support."
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (9034 => 9035)
--- trunk/arch/blackfin/Kconfig 2010-08-02 04:00:15 UTC (rev 9034)
+++ trunk/arch/blackfin/Kconfig 2010-08-02 06:44:20 UTC (rev 9035)
@@ -1238,15 +1238,6 @@
wake-up upon detection of an active low signal on the /GPW (PH7) pin.
On ADSP-BF549 this option enables the the same functionality on the
/MRXON pin also PH7.
-config PM_BFIN_WAKE_USB
- bool "Allow Wake-Up from USB"
- depends on PM && (BF54x || BF52x)
- default n
- help
- Enable USB Wake-Up (Voltage Regulator Power-Up) (all processors
- with USB support). This option sets the usb wake-up enable (USBWE)
- control bit to enable wake-up upon detection of a usb USB_DM,USB_DP
- or USB_VBUS edge.
endmenu
Modified: trunk/arch/blackfin/mach-common/pm.c (9034 => 9035)
--- trunk/arch/blackfin/mach-common/pm.c 2010-08-02 04:00:15 UTC (rev 9034)
+++ trunk/arch/blackfin/mach-common/pm.c 2010-08-02 06:44:20 UTC (rev 9035)
@@ -148,9 +148,6 @@
#ifdef CONFIG_PM_BFIN_WAKE_GP
wakeup |= GPWE;
#endif
-#ifdef CONFIG_PM_BFIN_WAKE_USB
- wakeup |= USBWE;
-#endif
local_irq_save_hw(flags);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
