linux-next: build failure after merge of the moduleh tree

Commit Message

Stephen Rothwell July 29, 2011, 5:37 a.m. UTC

Hi Paul,

On Fri, 29 Jul 2011 15:25:33 +1000 Stephen Rothwell <[e-mail]> wrote:
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/rc/ir-raw.c: In function 'init_decoders':
> drivers/media/rc/ir-raw.c:354:2: error: implicit declaration of function 'request_module'
> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <[e-mail]>
> Date: Fri, 29 Jul 2011 15:21:27 +1000
> Subject: [PATCH] ir-raw.c: include modules .h for request_module

Forget that, it was not the correct patch.  Instead I have added this
patch for today:

From: Stephen Rothwell <[e-mail]>
Date: Fri, 29 Jul 2011 15:34:32 +1000
Subject: [PATCH] ir-raw: include kmod.h for request_module

Signed-off-by: Stephen Rothwell <[e-mail]>
---
 drivers/media/rc/ir-raw.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Paul Gortmaker July 31, 2011, 6:31 a.m. UTC | #1

[Re: linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 15:37) Stephen Rothwell wrote:

[...]

> 
> Forget that, it was not the correct patch.  Instead I have added this
> patch for today:
> 
> From: Stephen Rothwell <[e-mail]>
> Date: Fri, 29 Jul 2011 15:34:32 +1000
> Subject: [PATCH] ir-raw: include kmod.h for request_module

Thanks, I just saw the same thing while retesting sparc on the latest
master content.  Applied to queue.

Paul.

> 
> Signed-off-by: Stephen Rothwell <[e-mail]>
> ---
>  drivers/media/rc/ir-raw.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
> index 56adca8..1ebaf5b 100644
> --- a/drivers/media/rc/ir-raw.c
> +++ b/drivers/media/rc/ir-raw.c
> @@ -15,6 +15,7 @@
>  #include <linux/kthread.h>
>  #include <linux/mutex.h>
>  #include <linux/export.h>
> +#include <linux/kmod.h>
>  #include <linux/sched.h>
>  #include <linux/freezer.h>
>  #include "rc-core-priv.h"
> -- 
> 1.7.5.4
> 
> 
> -- 
> Cheers,
> Stephen Rothwell                    [e-mail]
> http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 56adca8..1ebaf5b 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -15,6 +15,7 @@ 
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/export.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include "rc-core-priv.h"