diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
| commit | 20c040ce2176be4be250503497a0a103a3fb3b3e (patch) | |
| tree | fce5d1cf5860ea2aeb292736fd373da8e2ea5a98 /drivers/xen/manage.c | |
| parent | 7f01af04bdf59448f3d75744d7ad9713331bd0f7 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into next
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index ef9c7db52077..db8c4c4ac880 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -49,6 +49,7 @@ static int xen_hvm_suspend(void *data) if (!*cancelled) { xen_irq_resume(); + xen_console_resume(); xen_timer_resume(); } |