From patchwork Mon Apr 23 12:19:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10356897 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 C954860225 for ; Mon, 23 Apr 2018 12:19:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B96A728A26 for ; Mon, 23 Apr 2018 12:19:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD61C28A94; Mon, 23 Apr 2018 12:19:55 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, URIBL_RHS_DOB 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 CA3B128A91 for ; Mon, 23 Apr 2018 12:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836AbeDWMTx (ORCPT ); Mon, 23 Apr 2018 08:19:53 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:50839 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754828AbeDWMTr (ORCPT ); Mon, 23 Apr 2018 08:19:47 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180423121944euoutp02e6a22ec6cbc1216f519211ae60e2c326~oD_0X7Eng1899018990euoutp029 for ; Mon, 23 Apr 2018 12:19:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180423121944euoutp02e6a22ec6cbc1216f519211ae60e2c326~oD_0X7Eng1899018990euoutp029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1524485984; bh=C5J6yJ6MCRkJ9N6mpjRj7Ve7YTq9VI/4O+P3MO3t/ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uVX3Yx4hK08UgVYNR2FnkkMDawgkFHOi3rzDaSKwKiS9VuYjLLmKyEHx3std+mjXQ ITf0v8LuWlX+eoSTuu++MQvi8PDMIsrAI8VY3TF8PkJzqJWr3vLtYene96/0RFRosb i5NvBUAGg7RUSSoFLV/puUO2IsF+h3V4lOQsUmVI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180423121933eucas1p2e4a127eab13f63c87842d6f54220f3d8~oD_pvgkBU3273332733eucas1p2p; Mon, 23 Apr 2018 12:19:33 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id D2.62.05700.55FCDDA5; Mon, 23 Apr 2018 13:19:33 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20180423121932eucas1p212eb6412ff8df511047c3afa782db6e0~oD_o_5fVZ2009620096eucas1p2S; Mon, 23 Apr 2018 12:19:32 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20180423121932eusmtrp134f5c28f48046745cc535c08f52c87e8~oD_ovReu32021120211eusmtrp1n; Mon, 23 Apr 2018 12:19:32 +0000 (GMT) X-AuditID: cbfec7f2-1c1ff70000011644-fd-5addcf556b6b Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 3E.5B.04178.45FCDDA5; Mon, 23 Apr 2018 13:19:32 +0100 (BST) Received: from amdc3058.localnet (unknown [106.120.53.102]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20180423121932eusmtip1c0b08994b8e09d2a157c88590b87e455~oD_oiYHiU1196211962eusmtip1f; Mon, 23 Apr 2018 12:19:32 +0000 (GMT) From: Bartlomiej Zolnierkiewicz To: Mauro Carvalho Chehab Cc: Linux Media Mailing List , Mauro Carvalho Chehab , Florian Tobias Schandinat , Hans Verkuil , Arnd Bergmann , Sakari Ailus , Stanimir Varbanov , Philipp Zabel , Ramesh Shanmugasundaram , Jacob Chen , Bhumika Goyal , Al Viro , linux-fbdev@vger.kernel.org Subject: Re: [PATCH v2 7/7] media: via-camera: allow build on non-x86 archs with COMPILE_TEST Date: Mon, 23 Apr 2018 14:19:31 +0200 Message-ID: <5323943.SkjzUNBk3k@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <20180420160321.4ecefa00@vento.lan> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA02Se2xLcRTH/XofvStdrm6yn3pFg7BlrxBu2MQfws38gYSEZrbVdm3Luod2 HZNgMcaq3aNErUTYo/YIq+qqs8ajmz3JoplFNkWYx8ZiaoptHb1uxf77nHO+53e+5+RHIKJ3 mJhIz8plFFkyuQQXoNb2X73hu3td0qh2nYDy6tr5lPtlKU4VV/QDqvrXXR5VXNOIUJ0lYxil MTVhlK27EqFeVR+kXC87UeqR/jdCuS0eHnWyqI1H9Xo7sE2B9OSEDtB1Hy/x6fOTtzC62eDi 02NfE+jbtaH0gz4zTr/ot+P0la6ddKk3ija7XRj9zbyYNg+N8nYIpYKYFEaenscoIjcmCdJO aAbxnNpScLjhshYUgNfFQA0IApJr4KRzuxoEECKyFsCSihw1EPh4HMCb3V8AF3wDUFPXh7Aq tqHcPYByhesAtp5qwrlgDMDylk+AVeHkelh+uv4vB/s6am40YywjZDsKJyqXsRxEJsKulgE+ yyi5HFqMeh7LQnIVvHRCj7M8j4yDlnun/+YDyChoHL7p18yFXRVDKPdmGDRe+4SwJiCpJeCZ rx9QzupmaPe89dsOgiMdFj7HC2HPOQ3KNRQC6LHZ/aIyAO2NIo43wNaOpxh7JMTnqPFuJJeO haMeLY+7XSB8PjqX8xAIdVY9wqWF8EyR/5EV0GQ04f+mqpvr/INoWD5o45cBiWHGNoYZ2xj+ z70KkHoQwqiUmamMMjqLORShlGUqVVmpEcnZmWbg+3w90x1uG/ju3O8AJAEkc4S2cJdUhMny lPmZDgAJRBIspK2+lDBFln+EUWQnKlRyRukACwhUEiJMWHlMKiJTZblMBsPkMIp/VR4RIC4A 1qrjE0vW7Q0xa19t6UtOAbO3Ddc3OOLvdA6og6eCGuX3Fxm2ii/E2rzODMR0bOqN4uN6RZfg cW72uEp20fGjYP7D+LC6tnphzVjE0PuzmgOiaf2ItazyGdFUu/ozNsspvqhT7/LG7YyMqTo6 3hp29ucee1LhvrCWqftPMuLWpi2VoMo0WXQoolDK/gA8fw6JeAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsVy+t/xu7oh5+9GGZzeJGDxd9IxdotP9/rZ LDpnXmO0WPJzF5NF59L1zBYn+j6wWvRs2MpqsePUImaL+0sKLe7eO8FicXT6f2aLT1u+MVm0 tB1hsjj/9zirA5/H71+TGD1WvpjN7jHl90ZWj52z7rJ7fPgY57F5hZbHgSub2DzuXNvD5jHv ZKBH/18Dj02f7rJ6fN4k57HpyVumAN4oPZui/NKSVIWM/OISW6VoQwsjPUNLCz0jE0s9Q2Pz WCsjUyV9O5uU1JzMstQifbsEvYzVq8MLruRWNB/5wdTAeDa2i5GTQ0LARGLip1ssXYxcHEIC SxklvjfdZOpi5ABKyEgcX18GUSMs8edaFxtEzTtGie1vLjKDJNgErCQmtq9iBLFFgAYtXbuT FaSIWWAbi8S3TR3MIIOEBWIleo9KgdSwCKhKbFk2nQnE5hXQlJjdNJ0NxBYV8JLYsq8dLM4p YCCx7OU6JohlmxglZt57ywLRIChxcuYTMJtZQFti2cLXYPOZgQat36U/gVFwFpKqWUiqZiFU LWBkXsUoklpanJueW2yoV5yYW1yal66XnJ+7iREYy9uO/dy8g/HSxuBDjAIcjEo8vDt070YJ sSaWFVfmHmKU4GBWEuH12AYU4k1JrKxKLcqPLyrNSS0+xGgK9NtEZinR5HxgmskriTc0NTS3 sDQ0NzY3NrNQEuc9b1AZJSSQnliSmp2aWpBaBNPHxMEp1cCoY+IQ+e2908XDqtw5t9K875uy 7LJ5H1m/Mcx808sqydPliZ3n84wvb7ouwekl4vHdq31P6oJDi8IL5lkyP/1o6dIcFR6Qyiyr ezn4wQWB1nW9Udz5EdPOF1odenVyxcEPKkcuLhSdJXe3tjzrrDTbtVunzJ5JRZwqNDg8I3iq W9yeDREvuzYosRRnJBpqMRcVJwIAZhtfIfsCAAA= X-CMS-MailID: 20180423121932eucas1p212eb6412ff8df511047c3afa782db6e0 X-Msg-Generator: CA X-MTR: 20180423121932eucas1p212eb6412ff8df511047c3afa782db6e0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180423121932eucas1p212eb6412ff8df511047c3afa782db6e0 X-RootMTR: 20180423121932eucas1p212eb6412ff8df511047c3afa782db6e0 References: <396bfb33e763c31ead093ac1035b2ecf7311b5bc.1524245455.git.mchehab@s-opensource.com> <20180420160321.4ecefa00@vento.lan> 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 Hi Mauro, On Friday, April 20, 2018 04:03:21 PM Mauro Carvalho Chehab wrote: > This driver depends on FB_VIA for lots of things. Provide stubs > for the functions it needs, in order to allow building it with > COMPILE_TEST outside x86 architecture. Please cc: me on fbdev related patches (patch adding new FB_VIA ifdefs _is_ definitely fbdev related). > Signed-off-by: Mauro Carvalho Chehab > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index e3229f7baed1..abaaed98a044 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -15,7 +15,7 @@ source "drivers/media/platform/marvell-ccic/Kconfig" > > config VIDEO_VIA_CAMERA > tristate "VIAFB camera controller support" > - depends on FB_VIA > + depends on FB_VIA || COMPILE_TEST This is incorrect (too simple), please take a look at FB_VIA entry: config FB_VIA tristate "VIA UniChrome (Pro) and Chrome9 display support" depends on FB && PCI && X86 && GPIOLIB && I2C select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select I2C_ALGOBIT help Therefore you also need to check PCI, GPIOLIB && I2C dependencies. * For PCI=n: drivers/media/platform/via-camera.c: In function ‘viacam_serial_is_enabled’: drivers/media/platform/via-camera.c:1286:9: error: implicit declaration of function ‘pci_find_bus’ [-Werror=implicit-function-declaration] drivers/media/platform/via-camera.c:1286:25: warning: initialization makes pointer from integer without a cast [enabled by default] drivers/media/platform/via-camera.c:1296:2: error: implicit declaration of function ‘pci_bus_read_config_byte’ [-Werror=implicit-function-declaration] drivers/media/platform/via-camera.c:1308:2: error: implicit declaration of function ‘pci_bus_write_config_byte’ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[3]: *** [drivers/media/platform/via-camera.o] Error 1 * For I2C=n: WARNING: unmet direct dependencies detected for VIDEO_OV7670 Depends on [n]: MEDIA_SUPPORT [=y] && I2C [=n] && VIDEO_V4L2 [=y] && MEDIA_CAMERA_SUPPORT [=y] Selected by [y]: - VIDEO_VIA_CAMERA [=y] && MEDIA_SUPPORT [=y] && V4L_PLATFORM_DRIVERS [=y] && (FB_VIA [=n] || COMPILE_TEST [=y]) drivers/media/i2c/ov7670.c: In function ‘ov7670_read_smbus’: drivers/media/i2c/ov7670.c:483:2: error: implicit declaration of function ‘i2c_smbus_read_byte_data’ [-Werror=implicit-function-declaration] ret = i2c_smbus_read_byte_data(client, reg); ^ drivers/media/i2c/ov7670.c: In function ‘ov7670_write_smbus’: drivers/media/i2c/ov7670.c:496:2: error: implicit declaration of function ‘i2c_smbus_write_byte_data’ [-Werror=implicit-function-declaration] int ret = i2c_smbus_write_byte_data(client, reg, value); ^ drivers/media/i2c/ov7670.c: In function ‘ov7670_read_i2c’: drivers/media/i2c/ov7670.c:521:2: error: implicit declaration of function ‘i2c_transfer’ [-Werror=implicit-function-declaration] ret = i2c_transfer(client->adapter, &msg, 1); ^ drivers/media/i2c/ov7670.c: In function ‘ov7670_probe’: drivers/media/i2c/ov7670.c:1835:3: error: implicit declaration of function ‘i2c_adapter_id’ [-Werror=implicit-function-declaration] v4l_dbg(1, debug, client, ^ drivers/media/i2c/ov7670.c: At top level: drivers/media/i2c/ov7670.c:1962:1: warning: data definition has no type or storage class [enabled by default] module_i2c_driver(ov7670_driver); ^ drivers/media/i2c/ov7670.c:1962:1: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int] drivers/media/i2c/ov7670.c:1962:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/media/i2c/ov7670.c:1952:26: warning: ‘ov7670_driver’ defined but not used [-Wunused-variable] static struct i2c_driver ov7670_driver = { ^ cc1: some warnings being treated as errors make[3]: *** [drivers/media/i2c/ov7670.o] Error 1 * For GPIOLIB=n it builds fine. > select VIDEOBUF_DMA_SG > select VIDEO_OV7670 > help > diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c > index e9a02639554b..4ab1695b33af 100644 > --- a/drivers/media/platform/via-camera.c > +++ b/drivers/media/platform/via-camera.c > @@ -27,7 +27,10 @@ > #include > #include > #include > + > +#ifdef CONFIG_FB_VIA This should be CONFIG_X86. > #include > +#endif > > #include "via-camera.h" > > @@ -1283,6 +1286,11 @@ static bool viacam_serial_is_enabled(void) > struct pci_bus *pbus = pci_find_bus(0, 0); > u8 cbyte; > > +#ifdef CONFIG_FB_VIA ditto > + if (!machine_is_olpc()) > + return false; > +#endif > + > if (!pbus) > return false; > pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN, > @@ -1343,7 +1351,7 @@ static int viacam_probe(struct platform_device *pdev) > return -ENOMEM; > } > > - if (machine_is_olpc() && viacam_serial_is_enabled()) > + if (viacam_serial_is_enabled()) > return -EBUSY; > > /* > diff --git a/include/linux/via-core.h b/include/linux/via-core.h > index 9c21cdf3e3b3..ced4419baef8 100644 > --- a/include/linux/via-core.h > +++ b/include/linux/via-core.h > @@ -70,8 +70,12 @@ struct viafb_pm_hooks { > void *private; > }; > > +#ifdef CONFIG_FB_VIA > void viafb_pm_register(struct viafb_pm_hooks *hooks); > void viafb_pm_unregister(struct viafb_pm_hooks *hooks); > +#else > +static inline void viafb_pm_register(struct viafb_pm_hooks *hooks) {} > +#endif /* CONFIG_FB_VIA */ > #endif /* CONFIG_PM */ > > /* > @@ -113,8 +117,13 @@ struct viafb_dev { > * Interrupt management. > */ > > +#ifdef CONFIG_FB_VIA > void viafb_irq_enable(u32 mask); > void viafb_irq_disable(u32 mask); > +#else > +static inline void viafb_irq_enable(u32 mask) {} > +static inline void viafb_irq_disable(u32 mask) {} > +#endif > > /* > * The global interrupt control register and its bits. > @@ -157,10 +166,18 @@ void viafb_irq_disable(u32 mask); > /* > * DMA management. > */ > +#ifdef CONFIG_FB_VIA > int viafb_request_dma(void); > void viafb_release_dma(void); > /* void viafb_dma_copy_out(unsigned int offset, dma_addr_t paddr, int len); */ > int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg); > +#else > +static inline int viafb_request_dma(void) { return 0; } > +static inline void viafb_release_dma(void) {} > +static inline int viafb_dma_copy_out_sg(unsigned int offset, > + struct scatterlist *sg, int nsg) > +{ return 0; } > +#endif > > /* > * DMA Controller registers. > diff --git a/include/linux/via-gpio.h b/include/linux/via-gpio.h > index 8281aea3dd6d..b5a96cf7a874 100644 > --- a/include/linux/via-gpio.h > +++ b/include/linux/via-gpio.h > @@ -8,7 +8,11 @@ > #ifndef __VIA_GPIO_H__ > #define __VIA_GPIO_H__ > > +#ifdef CONFIG_FB_VIA > extern int viafb_gpio_lookup(const char *name); > extern int viafb_gpio_init(void); > extern void viafb_gpio_exit(void); > +#else > +static inline int viafb_gpio_lookup(const char *name) { return 0; } > +#endif > #endif > diff --git a/include/linux/via_i2c.h b/include/linux/via_i2c.h > index 44532e468c05..209bff950e22 100644 > --- a/include/linux/via_i2c.h > +++ b/include/linux/via_i2c.h > @@ -32,6 +32,7 @@ struct via_i2c_stuff { > }; > > > +#ifdef CONFIG_FB_VIA > int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata); > int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data); > int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len); > @@ -39,4 +40,9 @@ struct i2c_adapter *viafb_find_i2c_adapter(enum viafb_i2c_adap which); > > extern int viafb_i2c_init(void); > extern void viafb_i2c_exit(void); > +#else > +static inline > +struct i2c_adapter *viafb_find_i2c_adapter(enum viafb_i2c_adap which) > +{ return NULL; } > +#endif > #endif /* __VIA_I2C_H__ */ How's about just allowing COMPILE_TEST for FB_VIA instead of adding all these stubs? From: Bartlomiej Zolnierkiewicz Subject: [PATCH] video: fbdev: via: allow COMPILE_TEST build This patch allows viafb driver to be build on !X86 archs using COMPILE_TEST config option. Since via-camera driver (VIDEO_VIA_CAMERA) depends on viafb it also needs a little fixup. Cc: Florian Tobias Schandinat Cc: Mauro Carvalho Chehab Signed-off-by: Bartlomiej Zolnierkiewicz Reviewed-by: Mauro Carvalho Chehab --- drivers/media/platform/via-camera.c | 5 +++++ drivers/video/fbdev/Kconfig | 2 +- drivers/video/fbdev/via/global.h | 6 ++++++ drivers/video/fbdev/via/hw.c | 1 - drivers/video/fbdev/via/via-core.c | 1 - drivers/video/fbdev/via/via_clock.c | 2 +- drivers/video/fbdev/via/viafbdev.c | 1 - 7 files changed, 13 insertions(+), 5 deletions(-) Index: b/drivers/media/platform/via-camera.c =================================================================== --- a/drivers/media/platform/via-camera.c 2018-04-23 13:46:37.000000000 +0200 +++ b/drivers/media/platform/via-camera.c 2018-04-23 14:01:07.873322815 +0200 @@ -27,7 +27,12 @@ #include #include #include + +#ifdef CONFIG_X86 #include +#else +#define machine_is_olpc(x) 0 +#endif #include "via-camera.h" Index: b/drivers/video/fbdev/Kconfig =================================================================== --- a/drivers/video/fbdev/Kconfig 2018-04-10 12:34:26.618867549 +0200 +++ b/drivers/video/fbdev/Kconfig 2018-04-23 13:55:41.389314593 +0200 @@ -1437,7 +1437,7 @@ config FB_SIS_315 config FB_VIA tristate "VIA UniChrome (Pro) and Chrome9 display support" - depends on FB && PCI && X86 && GPIOLIB && I2C + depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT Index: b/drivers/video/fbdev/via/global.h =================================================================== --- a/drivers/video/fbdev/via/global.h 2017-10-18 14:35:22.079448310 +0200 +++ b/drivers/video/fbdev/via/global.h 2018-04-23 13:52:57.121310456 +0200 @@ -33,6 +33,12 @@ #include #include +#ifdef CONFIG_X86 +#include +#else +#define machine_is_olpc(x) 0 +#endif + #include "debug.h" #include "viafbdev.h" Index: b/drivers/video/fbdev/via/hw.c =================================================================== --- a/drivers/video/fbdev/via/hw.c 2017-10-18 14:35:22.079448310 +0200 +++ b/drivers/video/fbdev/via/hw.c 2018-04-23 13:54:24.881312666 +0200 @@ -20,7 +20,6 @@ */ #include -#include #include "global.h" #include "via_clock.h" Index: b/drivers/video/fbdev/via/via-core.c =================================================================== --- a/drivers/video/fbdev/via/via-core.c 2017-11-22 14:11:59.852728679 +0100 +++ b/drivers/video/fbdev/via/via-core.c 2018-04-23 13:53:24.893311156 +0200 @@ -17,7 +17,6 @@ #include #include #include -#include /* * The default port config. Index: b/drivers/video/fbdev/via/via_clock.c =================================================================== --- a/drivers/video/fbdev/via/via_clock.c 2017-10-18 14:35:22.083448309 +0200 +++ b/drivers/video/fbdev/via/via_clock.c 2018-04-23 13:53:45.389311672 +0200 @@ -25,7 +25,7 @@ #include #include -#include + #include "via_clock.h" #include "global.h" #include "debug.h" Index: b/drivers/video/fbdev/via/viafbdev.c =================================================================== --- a/drivers/video/fbdev/via/viafbdev.c 2017-11-22 14:11:59.852728679 +0100 +++ b/drivers/video/fbdev/via/viafbdev.c 2018-04-23 13:53:55.325311922 +0200 @@ -25,7 +25,6 @@ #include #include #include -#include #define _MASTER_FILE #include "global.h"