From patchwork Tue Apr 2 09:27:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Ortiz X-Patchwork-Id: 2376491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3BB164020C for ; Tue, 2 Apr 2013 09:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343Ab3DBJ15 (ORCPT ); Tue, 2 Apr 2013 05:27:57 -0400 Received: from mga09.intel.com ([134.134.136.24]:37316 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932321Ab3DBJ14 (ORCPT ); Tue, 2 Apr 2013 05:27:56 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 02 Apr 2013 02:26:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,392,1363158000"; d="scan'208";a="311066074" Received: from unknown (HELO zurbaran) ([10.252.121.17]) by orsmga002.jf.intel.com with ESMTP; 02 Apr 2013 02:27:54 -0700 Date: Tue, 2 Apr 2013 11:27:51 +0200 From: Samuel Ortiz To: "John W. Linville" Cc: Linux Wireless Subject: [PATCH] Revert "NFC: microread: Fix MEI build failure" Message-ID: <20130402092751.GE17363@zurbaran> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This reverts commit 63cd353c34a08af2d1935f8d0c2b6b091714ff79. We no longer need this fix as the MEI bus APIs are now merged into char-misc-next. Signed-off-by: Samuel Ortiz --- John, this one is for wireless-next and will fix the conflict between net-next and wireless that Stephen reported today. --- drivers/nfc/microread/mei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 13bde92..eef38cf 100644 --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c @@ -48,7 +48,7 @@ struct mei_nfc_hdr { #define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD) struct microread_mei_phy { - struct mei_device *device; + struct mei_device *mei_device; struct nfc_hci_dev *hdev; int powered;