diff options
| author | Steve Schefter <sschefter@ti.com> | 2010-11-16 11:56:08 -0500 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-03-30 10:11:31 -0700 |
| commit | b001d41cf2b326933dea9bda88fae3826ad7e8f4 (patch) | |
| tree | e91774f09abb7f8231e394c793f66e67e29bf9e3 | |
| parent | 7bc185ce65eb8b79f89a78bfc23fcf1b9e2b2121 (diff) | |
| download | experimental-b001d41cf2b326933dea9bda88fae3826ad7e8f4.tar.gz | |
OMAP3: PVR: Won't compile without CONFIG_HAS_EARLYSUSPEND.
Add support for compiling with CONFIG_HAS_EARLYSUSPEND turned off. Turning
this off is needed as a temporary step in getting OMAP3 support in 2.6.35.
Signed-off-by: Steve Schefter <sschefter@ti.com>
Acked-by: Leed Aguilar <leed.aguilar@ti.com>
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_linux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c index 4f1ac9b0da5..5fe7c3b8563 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c @@ -287,7 +287,7 @@ static struct platform_device omaplfb_device = { }; #endif -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) static struct early_suspend omaplfb_early_suspend; @@ -318,7 +318,7 @@ static struct platform_driver omaplfb_driver = { } }; -#else /* defined(SGX_EARLYSUSPEND) */ +#else /* defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) */ /* * Function called when the driver is requested to be suspended @@ -364,7 +364,7 @@ static struct platform_driver omaplfb_driver = { .shutdown = OMAPLFBDriverShutdown_Entry, }; -#endif /* defined(SGX_EARLYSUSPEND) */ +#endif /* defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) */ #endif /* defined(LDM_PLATFORM) */ @@ -400,7 +400,7 @@ static int __init OMAPLFB_Init(void) } #endif -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) omaplfb_early_suspend.suspend = OMAPLFBDriverSuspend_Entry; omaplfb_early_suspend.resume = OMAPLFBDriverResume_Entry; omaplfb_early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB; @@ -424,7 +424,7 @@ static IMG_VOID __exit OMAPLFB_Cleanup(IMG_VOID) #endif DEBUG_PRINTK("Removing platform driver"); platform_driver_unregister(&omaplfb_driver); -#if defined(SGX_EARLYSUSPEND) +#if defined(SGX_EARLYSUSPEND) && defined(CONFIG_HAS_EARLYSUSPEND) unregister_early_suspend(&omaplfb_early_suspend); #endif #endif |