diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:07:14 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:07:14 +0100 |
| commit | 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 (patch) | |
| tree | f573761ac752ff04ec445e23aef50adadda49790 /drivers/misc/vmw_balloon.c | |
| parent | omap: omap3evm: add support for the WL12xx WLAN module to the omap3evm (diff) | |
| parent | arm: omap: fix section mismatch warning (diff) | |
| download | linux-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.tar.xz linux-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.zip | |
Merge branch 'devel-cleanup' into omap-for-linus
Conflicts:
arch/arm/mach-omap2/timer-gp.c
Diffstat (limited to 'drivers/misc/vmw_balloon.c')
| -rw-r--r-- | drivers/misc/vmw_balloon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 4d2ea8e80140..6df5a55da110 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -785,7 +785,7 @@ static int __init vmballoon_init(void) if (x86_hyper != &x86_hyper_vmware) return -ENODEV; - vmballoon_wq = create_freezeable_workqueue("vmmemctl"); + vmballoon_wq = create_freezable_workqueue("vmmemctl"); if (!vmballoon_wq) { pr_err("failed to create workqueue\n"); return -ENOMEM; |