diff options
| author | Andy Green <andy.green@linaro.org> | 2011-05-31 09:25:20 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:06:52 +0100 |
| commit | 3bee6178ebfb7b4e5f678b7e1cb42d867bc27b08 (patch) | |
| tree | a268f2189f670204d14aec1864bbf7fb53d2b235 | |
| parent | 946d601a1badd7c485bc8457b1314edb2b32c2e0 (diff) | |
SGX only use earlysuspend if configured
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/gpu/pvr/display/omap_sgx_displayclass.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_linux.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/display/omap_sgx_displayclass.c b/drivers/gpu/pvr/display/omap_sgx_displayclass.c index 7ae2420d3e3..89852fb8471 100644 --- a/drivers/gpu/pvr/display/omap_sgx_displayclass.c +++ b/drivers/gpu/pvr/display/omap_sgx_displayclass.c @@ -35,7 +35,7 @@ #if defined(LDM_PLATFORM) #include <linux/platform_device.h> -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) #include <linux/earlysuspend.h> #endif #endif @@ -1485,7 +1485,7 @@ static void CommonSuspend(void) bDeviceSuspended = OMAP_TRUE; } -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) static struct early_suspend driver_early_suspend; @@ -1587,7 +1587,7 @@ static int __init omap_sgx_dc_init(void) return -ENODEV; } -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) driver_early_suspend.suspend = DriverSuspend_Entry; driver_early_suspend.resume = DriverResume_Entry; driver_early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB; @@ -1607,7 +1607,7 @@ static IMG_VOID __exit omap_sgx_dc_deinit(IMG_VOID) #if defined(LDM_PLATFORM) DEBUG_PRINTK("Removing platform driver"); platform_driver_unregister(&omap_sgx_dc_driver); -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) unregister_early_suspend(&driver_early_suspend); #endif #endif diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c index e1cf569e387..1a84db45eb7 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c @@ -54,7 +54,7 @@ #if defined(LDM_PLATFORM) #include <linux/platform_device.h> -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) #include <linux/earlysuspend.h> #endif #endif |