From patchwork Fri Mar 24 13:20:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9642805 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 62D3F601E9 for ; Fri, 24 Mar 2017 13:22:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5198020008 for ; Fri, 24 Mar 2017 13:22:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44AED27E5A; Fri, 24 Mar 2017 13:22:40 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 4350820008 for ; Fri, 24 Mar 2017 13:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756359AbdCXNWS (ORCPT ); Fri, 24 Mar 2017 09:22:18 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:64570 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753174AbdCXNWR (ORCPT ); Fri, 24 Mar 2017 09:22:17 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LtRci-1c8XnY2TZ6-010tAj; Fri, 24 Mar 2017 14:21:36 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox , Arnd Bergmann Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: media: atomisp: remove ifdef around HMM_BO_ION Date: Fri, 24 Mar 2017 14:20:24 +0100 Message-Id: <20170324132127.3199892-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:tE0tehgFZgmtNaxJfRiO3MkipUYihCyU6gz340P8SCWHIYcsJty gatpXdajmzXrkR51MMnhcUT8nKYbEHp6l6tBUmVj09hSHXIBcYq1E5oZeWC08G69VhhVxr4 qA0WIRChdzqoMCrCLsiPbeBpBKw1vjAQTg+aQIaTJEuNn8IKx5n7LSC7kze8cTkGHXUO8e3 7PnjaMWdqZ4EikZESQaRA== X-UI-Out-Filterresults: notjunk:1; V01:K0:BO/utjT/2NA=:ot8+rVbPSd4ag1de864k3u Yxmr3CGJOPqpXZBRSXsretglE8aEspx704YfKn5xP2Z6m0yZDU2ByuzwCT97gOVL3o7kp97uM ZoRfLuRAz0KDNbF7ov/wqoLsUx2+rc/09FNNH4cO1Gc/WcaCdht7qF1jyDVi3oZuWgvWc5alD S7UNJcZMe2h9ZB13jdKSkiPem01fwG+lr6Fvn4CO7SI6+eE4ebxx0BGiACVfZKuPrml8E5jTr FNDn121ovwlSv8GdLl9d/ZqJ0kgl/627FpVoW6eMqhaqNZFjl/rKRkA+t0CJiVGNtp6EiKbVM dZyZNHxychwSIQlD7HiNaQaI7gz3GFnpJbM4uwLM81NbLEsZt63KZBQ8AIgEadd7s5etiZWMW iIwh4GD7UQIG3Ko8pEHTSzKoWo9GX2ya3pRUW3qgK3PvuyqisoFnCCgR+67NEaz4/PcSSctW1 VoRrrnh7PPd8C8NZzjlQ5nI6BjB6VHpThAPjwHs255ya9qvznVjTMgtPf3WYUFSNXHClpRnVr nLvLTOPqxuwecrZB2Y+us8tGYMC8maN7Mk8n/sHWR0MzLMSD0+BJXr+deyBqToLL8VB/haikq //x/x/OKIsZuExlhD+GEUVUb3STgVA6mMzTF3HdkhALa44DbiCp64zyyWdAqEYH4yx6X9iUcb vKr2ZNiLyYSlyLRyFEtS7fOtgPIxKjQGB+LoHq1JGB4T1kSI7IP+U2xQW0IhzL0EGAT4= 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 The revert reintroduced a build failure without CONFIG_ION: media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: error: excess elements in array initializer [-Werror] media/atomisp/pci/atomisp2/hmm/hmm.c:52:2: note: (near initialization for 'hmm_bo_type_strings') We should really be able to build in any configuration, so this tries a different fix to make sure the symbol is defined. Fixes: 9ca98bd07748 ("Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled"") Signed-off-by: Arnd Bergmann --- drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h index dffd6e9cf693..513d06dff043 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h @@ -81,9 +81,7 @@ enum hmm_bo_type { HMM_BO_PRIVATE, HMM_BO_SHARE, HMM_BO_USER, -#ifdef CONFIG_ION HMM_BO_ION, -#endif HMM_BO_LAST, };