From patchwork Wed Jun 1 11:46:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 839212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p51BkMIk017444 for ; Wed, 1 Jun 2011 11:47:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758829Ab1FALre (ORCPT ); Wed, 1 Jun 2011 07:47:34 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2406 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758860Ab1FALqk (ORCPT ); Wed, 1 Jun 2011 07:46:40 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 01 Jun 2011 04:50:44 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Wed, 1 Jun 2011 04:46:17 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 8B7ED74D06; Wed, 1 Jun 2011 04:46:25 -0700 (PDT) Received: from rvossenubuntu (svpn-10-240-253-102.broadcom.com [10.240.253.102]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 7740020505; Wed, 1 Jun 2011 04:46:24 -0700 (PDT) Received: from rvossen by rvossenubuntu with local (Exim 4.74) ( envelope-from ) id 1QRjsU-00022Q-JI; Wed, 01 Jun 2011 13:46:22 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 77/83] staging: brcm80211: moved /include/sdio_host.h to /brcmfmac dir Date: Wed, 1 Jun 2011 13:46:02 +0200 Message-ID: <1306928768-7501-77-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306928768-7501-1-git-send-email-rvossen@broadcom.com> References: <1306928768-7501-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 61F8F81B1IC14209887-09-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Jun 2011 11:47:41 +0000 (UTC) Code cleanup. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 2 ++ drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 2 -- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 2 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 +- .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4 +--- .../brcm80211/{include => brcmfmac}/sdio_host.h | 0 7 files changed, 6 insertions(+), 8 deletions(-) rename drivers/staging/brcm80211/{include => brcmfmac}/sdio_host.h (100%) diff --git a/drivers/staging/brcm80211/include/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h similarity index 100% rename from drivers/staging/brcm80211/include/sdio_host.h rename to drivers/staging/brcm80211/brcmfmac/sdio_host.h diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h index 53c3291..e9da1ce 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h @@ -17,6 +17,8 @@ #ifndef _sdio_api_h_ #define _sdio_api_h_ +#include "sdio_host.h" + #define SDIOH_API_RC_SUCCESS (0x00) #define SDIOH_API_RC_FAIL (0x01) #define SDIOH_API_SUCCESS(status) (status == 0) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index d6e90d7..b3bdd48 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -25,8 +25,6 @@ #include #include -#include /* BRCM API for SDIO - clients (such as wl, dhd) */ #include /* common SDIO/controller interface */ #include /* BRCM sdio device core */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 37cf61a..71ef23a 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include "sdio_host.h" #if defined(OOB_INTR_ONLY) #include diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 03a5966..66e204b 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include "sdio_host.h" #include /* bcmsdh to/from specific controller APIs */ #include /* ioctl/iovars */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 85ed095..9fc491d 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include "sdio_host.h" #include /* bcmsdh to/from specific controller APIs */ #include /* to get msglevel bit values */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 966d98d..899890f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -22,9 +22,7 @@ #include #include #include -#include - -#include +#include "sdio_host.h" #include #include #include