[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1301495050-7374-1-git-send-email-jmunhoz@igalia.com>
Date: Wed, 30 Mar 2011 16:24:10 +0200
From: Javier Muñoz Mellid <jmunhoz@...lia.com>
To: gregkh@...e.de, gewang@...iconmotion.com,
boyod.yang@...iconmotion.com.cn, wuzhangjin@...il.com
Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
"Javier M. Mellid" <jmunhoz@...lia.com>
Subject: [PATCH] staging: sm7xx: fixed defines
From: Javier M. Mellid <jmunhoz@...lia.com>
Deleted redundant __KERNEL__ define
PM methods (suspend and resume) enabled under CONFIG_PM only
Signed-off-by: Javier M. Mellid <jmunhoz@...lia.com>
---
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 d007e4a..0d65971 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -26,10 +26,6 @@
* Boyod.yang <boyod.yang@...iconmotion.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
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists