Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / include / linux / pm.h

diff --git a/include/linux/pm.h b/include/linux/pm.h
index a0894bc52bb4560180f18d823e167e75b968c3db..b8b4df09fd8f5ed3eb3ce5c0f47e4068ba702ca2 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -584,7 +584,6 @@ struct dev_pm_info {
        unsigned int            idle_notification:1;
        unsigned int            request_pending:1;
        unsigned int            deferred_resume:1;
-       unsigned int            run_wake:1;
        unsigned int            runtime_auto:1;
        bool                    ignore_children:1;
        unsigned int            no_callbacks:1;