From patchwork Fri Mar 10 11:35:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 39955 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmIq5-0004NU-Cr; Fri, 10 Mar 2017 11:36:05 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cmIq3-0004lT-19; Fri, 10 Mar 2017 12:36:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933696AbdCJLfv (ORCPT + 1 other); Fri, 10 Mar 2017 06:35:51 -0500 Received: from mga02.intel.com ([134.134.136.20]:26385 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933204AbdCJLft (ORCPT ); Fri, 10 Mar 2017 06:35:49 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Mar 2017 03:35:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,140,1486454400"; d="scan'208";a="1140465028" Received: from acox1-desk1.ger.corp.intel.com ([10.252.18.115]) by fmsmga002.fm.intel.com with ESMTP; 10 Mar 2017 03:35:18 -0800 Subject: [PATCH 8/8] atomisp: remove FPGA defines From: Alan Cox To: greg@kroah.com, linux-media@vger.kernel.org Date: Fri, 10 Mar 2017 11:35:17 +0000 Message-ID: <148914571319.25309.6693184637114214680.stgit@acox1-desk1.ger.corp.intel.com> In-Reply-To: <148914560647.25309.2276061224604665212.stgit@acox1-desk1.ger.corp.intel.com> References: <148914560647.25309.2276061224604665212.stgit@acox1-desk1.ger.corp.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.10.112417 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, SUPERLONG_LINE 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' These are not relevant to an upstream kernel driver. Signed-off-by: Alan Cox --- .../host/hive_isp_css_hrt_modified.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h index 603ef1d..342553d 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h @@ -30,21 +30,6 @@ #include #include #include -#ifdef _HIVE_ISP_CSS_FPGA_SYSTEM - #include - #include - #include - #include - #include - #include -#define hrt_gdc_slave_port(gdc_id) HRTCAT(gdc_id,_sl_in) - #include - #include - #include "isp_css_dev_flash_hrt.h" - #include "isp_css_dev_display_hrt.h" - #include "isp_css_dev_i2c_hrt.h" - #include "isp_css_dev_tb.h" -#else /* CSS ASIC system */ #include // #include // #include @@ -63,7 +48,6 @@ #error "hive_isp_css_hrt_modified.h: SYSTEM must be one of {2400_MAMOIADA_SYSTEM, 2401_MAMOIADA_SYSTEM}" #endif #endif -#endif /* _HIVE_ISP_CSS_FPGA_SYSTEM */ #include #include #include