From patchwork Thu Apr 19 20:38:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guy, Wey-Yi" X-Patchwork-Id: 153870 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 484A4B6FF8 for ; Fri, 20 Apr 2012 06:43:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756427Ab2DSUnY (ORCPT ); Thu, 19 Apr 2012 16:43:24 -0400 Received: from mga09.intel.com ([134.134.136.24]:53003 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396Ab2DSUnX (ORCPT ); Thu, 19 Apr 2012 16:43:23 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 19 Apr 2012 13:43:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="134546475" Received: from wwguy-huron.hf.intel.com (HELO localhost.localdomain) ([10.10.70.131]) by orsmga002.jf.intel.com with ESMTP; 19 Apr 2012 13:43:23 -0700 From: Wey-Yi Guy To: davem@davemloft.net Cc: netdev@vger.kernel.org, David Spinadel , Wey-Yi Guy Subject: [PATCH] update for net-next: iwlwifi: Remove inconsistent and redundant declaration Date: Thu, 19 Apr 2012 13:38:44 -0700 Message-Id: <1334867924-6991-1-git-send-email-wey-yi.w.guy@intel.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Spinadel Remove declaration of iwl_alloc_traffic_mem from iwl-agn.h, from methods that was exposed to support MVM. MVM doesn't have to use this declaration. CC: netdev@vger.kernel.org Signed-off-by: David Spinadel Signed-off-by: Wey-Yi Guy --- drivers/net/wireless/iwlwifi/iwl-agn.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 67cd123..3d6f3e2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h @@ -510,7 +510,6 @@ void iwl_setup_deferred_work(struct iwl_priv *priv); int iwl_send_wimax_coex(struct iwl_priv *priv); int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type); void iwl_debug_config(struct iwl_priv *priv); -int iwl_alloc_traffic_mem(struct iwl_priv *priv); void iwl_set_hw_params(struct iwl_priv *priv); void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags); int iwl_init_drv(struct iwl_priv *priv);