diff options
| author | Javier M. Mellid <jmunhoz@igalia.com> | 2011-03-30 16:24:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:37:04 -0700 |
| commit | 392a002a0066812480e1b55639bbced5936d26aa (patch) | |
| tree | 60a28f7d64b575bc341b8f68aa3cb15c12ab1c19 /drivers/staging/sm7xx | |
| parent | 9c94b7a668ea7422ad75e97c3bfd6274b37495c6 (diff) | |
| download | blackbird-op-linux-392a002a0066812480e1b55639bbced5936d26aa.tar.gz blackbird-op-linux-392a002a0066812480e1b55639bbced5936d26aa.zip | |
staging: sm7xx: fixed defines
Deleted redundant __KERNEL__ define
PM methods (suspend and resume) enabled under CONFIG_PM only
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/sm7xx')
| -rw-r--r-- | drivers/staging/sm7xx/smtcfb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index d007e4a12c14..0d65971457fc 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c @@ -26,10 +26,6 @@ * Boyod.yang <boyod.yang@siliconmotion.com.cn> */ -#ifndef __KERNEL__ -#define __KERNEL__ -#endif - #include <linux/io.h> #include <linux/fb.h> #include <linux/pci.h> @@ -1019,6 +1015,7 @@ static void __devexit smtcfb_pci_remove(struct pci_dev *pdev) smtc_free_fb_info(sfb); } +#ifdef CONFIG_PM /* Jason (08/14/2009) * suspend function, called when the suspend event is triggered */ @@ -1111,6 +1108,7 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev) return 0; } +#endif /* Jason (08/13/2009) * pci_driver struct used to wrap the original driver |
