diff mbox

soc/tegra: fuse: fix build break due to missing linux/module.h include

Message ID alpine.DEB.2.02.1506040728080.12316@utopia.booyaka.com
State Deferred
Headers show

Commit Message

Paul Walmsley June 4, 2015, 7:28 a.m. UTC
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 <paul@pwsan.com>
Cc: Paul Walmsley <pwalmsley@nvidia.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/soc/tegra/fuse/fuse-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thierry Reding June 4, 2015, 8:14 a.m. UTC | #1
On Thu, Jun 04, 2015 at 07:28:48AM +0000, Paul Walmsley wrote:
> 
> 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 <paul@pwsan.com>
> Cc: Paul Walmsley <pwalmsley@nvidia.com>
> Cc: Thierry Reding <treding@nvidia.com>
> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>  drivers/soc/tegra/fuse/fuse-tegra.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I've squashed this into the offending commit, thanks.

Thierry
diff mbox

Patch

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 <linux/clk.h>
 #include <linux/device.h>
 #include <linux/kobject.h>
-#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_address.h>