From patchwork Thu Jun 4 07:28:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 480539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AE0BA1401AF for ; Thu, 4 Jun 2015 17:28:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750978AbbFDH2t (ORCPT ); Thu, 4 Jun 2015 03:28:49 -0400 Received: from utopia.booyaka.com ([74.50.51.50]:34871 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868AbbFDH2t (ORCPT ); Thu, 4 Jun 2015 03:28:49 -0400 Received: (qmail 5386 invoked by uid 1019); 4 Jun 2015 07:28:48 -0000 Date: Thu, 4 Jun 2015 07:28:48 +0000 (UTC) From: Paul Walmsley To: linux-tegra@vger.kernel.org cc: treding@nvidia.com, Paul Gortmaker , Paul Walmsley Subject: [PATCH] soc/tegra: fuse: fix build break due to missing linux/module.h include Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org tegra_defconfig builds are broken on next-20150603: ---- drivers/soc/tegra/fuse/fuse-tegra.c:171:1: warning: data definition has no type or storage class [enabled by default] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: warning: data definition has no type or storage class [enabled by default] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: error: type defaults to 'int' in declaration of 'module_exit' [-Werror=implicit-int] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/soc/tegra/fuse/fuse-tegra.c:171:1: warning: 'tegra_fuse_driver_init' defined but not used [-Wunused-function] ---- This is due to the intersection of commit 436b6428b9cc97f61721f335eb9d8010751a337e ("soc/tegra: fuse: Unify Tegra20 and Tegra30 drivers") and commit 5ebbb3badaa8ffc50558af88cdea27497953356a ("module: relocate module_init from init.h to module.h") in the linux-next tree. Fix by replacing the linux/kernel.h include in drivers/soc/tegra/fuse/fuse-tegra.c with a linux/module.h include. Signed-off-by: Paul Walmsley Cc: Paul Walmsley Cc: Thierry Reding Cc: Paul Gortmaker --- drivers/soc/tegra/fuse/fuse-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c index daba1894bb1a..de2c1bfe28b5 100644 --- a/drivers/soc/tegra/fuse/fuse-tegra.c +++ b/drivers/soc/tegra/fuse/fuse-tegra.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include