From patchwork Sun Nov 8 22:27:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 58633 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA8MRehU016784 for ; Sun, 8 Nov 2009 22:27:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755568AbZKHW1d (ORCPT ); Sun, 8 Nov 2009 17:27:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755566AbZKHW1c (ORCPT ); Sun, 8 Nov 2009 17:27:32 -0500 Received: from server19320154104.serverpool.info ([193.201.54.104]:35626 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755554AbZKHW1c (ORCPT ); Sun, 8 Nov 2009 17:27:32 -0500 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id 2902A83CF; Sun, 8 Nov 2009 23:27:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hauke-m.de Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G8nSLIopbTZC; Sun, 8 Nov 2009 23:27:32 +0100 (CET) Received: from localhost.localdomain (host-091-097-247-085.ewe-ip-backbone.de [91.97.247.85]) by hauke-m.de (Postfix) with ESMTPSA id CE78F83CD; Sun, 8 Nov 2009 23:27:31 +0100 (CET) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 2/4] Fix two warnings Date: Sun, 8 Nov 2009 23:27:09 +0100 Message-Id: <1257719231-2031-3-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1257719231-2031-1-git-send-email-hauke@hauke-m.de> References: <1257719231-2031-1-git-send-email-hauke@hauke-m.de> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/compat/patches/11-dev-pm-ops.patch b/compat/patches/11-dev-pm-ops.patch index a1937a9..fc4de8f 100644 --- a/compat/patches/11-dev-pm-ops.patch +++ b/compat/patches/11-dev-pm-ops.patch @@ -14,7 +14,6 @@ calls on compat code with only slight modifications. static int ath5k_pci_suspend(struct device *dev); static int ath5k_pci_resume(struct device *dev); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) -+#endif +static int ath5k_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state) +{ + int r; @@ -40,6 +39,7 @@ calls on compat code with only slight modifications. + + return ath5k_pci_resume(&pdev->dev); +} ++#endif SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); #define ATH5K_PM_OPS (&ath5k_pm_ops)