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: 9616183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 721BC60415 for ; Fri, 10 Mar 2017 11:35:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6739228710 for ; Fri, 10 Mar 2017 11:35:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58FF328712; Fri, 10 Mar 2017 11:35:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2F1728710 for ; Fri, 10 Mar 2017 11:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933696AbdCJLfv (ORCPT ); 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-Virus-Scanned: ClamAV using ClamSMTP 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