From patchwork Thu Sep 10 09:26:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7152991 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B67D99F1D3 for ; Thu, 10 Sep 2015 09:26:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF626208BA for ; Thu, 10 Sep 2015 09:26:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ED96208B6 for ; Thu, 10 Sep 2015 09:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbbIJJ0g (ORCPT ); Thu, 10 Sep 2015 05:26:36 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:27132 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305AbbIJJ0g (ORCPT ); Thu, 10 Sep 2015 05:26:36 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 10 Sep 2015 11:26:29 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 2/5] staging: wilc1000: remove firmware definition Date: Thu, 10 Sep 2015 18:26:27 +0900 Message-ID: <1441877190-4546-2-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441877190-4546-1-git-send-email-tony.cho@atmel.com> References: <1441877190-4546-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes the firmware definitions, STA_FIRMWARE, AP_FIRMWARE, and P2P_CONCURRENCY_FIRMWARE from the linux_wlan.c file because they are defined in the Makefile. Signed-off-by: Tony Cho --- drivers/staging/wilc1000/linux_wlan.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index df5ee26..8e19095 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -101,18 +101,6 @@ static struct notifier_block g_dev_notifier = { if (g_linux_wlan->oup.wlan_cleanup != NULL) \ g_linux_wlan->oup.wlan_cleanup(); } -#ifndef STA_FIRMWARE -#define STA_FIRMWARE "wifi_firmware.bin" -#endif - -#ifndef AP_FIRMWARE -#define AP_FIRMWARE "wifi_firmware_ap.bin" -#endif - -#ifndef P2P_CONCURRENCY_FIRMWARE -#define P2P_CONCURRENCY_FIRMWARE "wifi_firmware_p2p_concurrency.bin" -#endif - typedef struct android_wifi_priv_cmd { char *buf; int used_len;