From patchwork Sat May 29 22:23:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Doerffel X-Patchwork-Id: 103098 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4TMoHqw000882 for ; Sat, 29 May 2010 22:50:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756806Ab0E2WuR (ORCPT ); Sat, 29 May 2010 18:50:17 -0400 Received: from jack.hrz.tu-chemnitz.de ([134.109.132.46]:46613 "EHLO jack.hrz.tu-chemnitz.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756668Ab0E2WuQ (ORCPT ); Sat, 29 May 2010 18:50:16 -0400 Received: from vpnclient-194-148.hrz.tu-chemnitz.de ([134.109.194.148] helo=localhost.localdomain) by jack.hrz.tu-chemnitz.de with esmtpa (Exim 4.69) (envelope-from ) id 1OIURj-0002vj-0t; Sun, 30 May 2010 00:23:59 +0200 From: Tobias Doerffel To: linux-input@vger.kernel.org Cc: Tobias Doerffel Subject: [PATCH] Input: matrix_keypad - depend on CONFIG_PM_SLEEP for suspend/resume functions Date: Sun, 30 May 2010 00:23:55 +0200 Message-Id: <1275171835-13246-1-git-send-email-tobias.doerffel@gmail.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-Spam-Score: 0.2 (/) X-Spam-Report: --- Start der SpamAssassin 3.3.0 Textanalyse (0.2 Punkte) Fragen an/questions to: Postmaster TU Chemnitz * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 FREEMAIL_FROM Sender email is freemail * (tobias.doerffel[at]gmail.com) * 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is * CUSTOM_MED * 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list * 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL --- Ende der SpamAssassin Textanalyse X-Scan-Signature: aa86db5e7f3e85aa9355d5c307b12c26 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 29 May 2010 22:50:18 +0000 (UTC) diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index b443e08..139a3bc 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c @@ -215,7 +215,7 @@ static void matrix_keypad_stop(struct input_dev *dev) disable_row_irqs(keypad); } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int matrix_keypad_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -440,7 +440,7 @@ static struct platform_driver matrix_keypad_driver = { .driver = { .name = "matrix-keypad", .owner = THIS_MODULE, -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .pm = &matrix_keypad_pm_ops, #endif },