diff options
author | Javier M. Mellid <jmunhoz@igalia.com> | 2011-03-30 10:24:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-05 00:37:04 -0400 |
commit | 392a002a0066812480e1b55639bbced5936d26aa (patch) | |
tree | 60a28f7d64b575bc341b8f68aa3cb15c12ab1c19 /drivers | |
parent | 9c94b7a668ea7422ad75e97c3bfd6274b37495c6 (diff) |
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')
-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 @@ | |||
26 | * Boyod.yang <boyod.yang@siliconmotion.com.cn> | 26 | * Boyod.yang <boyod.yang@siliconmotion.com.cn> |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef __KERNEL__ | ||
30 | #define __KERNEL__ | ||
31 | #endif | ||
32 | |||
33 | #include <linux/io.h> | 29 | #include <linux/io.h> |
34 | #include <linux/fb.h> | 30 | #include <linux/fb.h> |
35 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
@@ -1019,6 +1015,7 @@ static void __devexit smtcfb_pci_remove(struct pci_dev *pdev) | |||
1019 | smtc_free_fb_info(sfb); | 1015 | smtc_free_fb_info(sfb); |
1020 | } | 1016 | } |
1021 | 1017 | ||
1018 | #ifdef CONFIG_PM | ||
1022 | /* Jason (08/14/2009) | 1019 | /* Jason (08/14/2009) |
1023 | * suspend function, called when the suspend event is triggered | 1020 | * suspend function, called when the suspend event is triggered |
1024 | */ | 1021 | */ |
@@ -1111,6 +1108,7 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev) | |||
1111 | 1108 | ||
1112 | return 0; | 1109 | return 0; |
1113 | } | 1110 | } |
1111 | #endif | ||
1114 | 1112 | ||
1115 | /* Jason (08/13/2009) | 1113 | /* Jason (08/13/2009) |
1116 | * pci_driver struct used to wrap the original driver | 1114 | * pci_driver struct used to wrap the original driver |