Re: [resend][GIT PULL] kbuild updates for 2.6.33

From: Michal Marek
Date: Thu Dec 17 2009 - 07:01:29 EST


On 17.12.2009 03:17, Stephen Rothwell wrote:
> Hi Linus, Michal,
>
> On Wed, 16 Dec 2009 23:28:16 +0100 Michal Marek <mmarek@xxxxxxx> wrote:
>>
>> kbuild: move autoconf.h to include/generated
>
> Since Rusty's module changes are now upstream, the above change requires
> this fixup which I have been carrying in linux-next for some time:

Ah, thanks, I forgot about this one. I rebased the for-next branch now
and added your patch. I didn't touch the for-33 branch in order to not
invalidate the pull request.


> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 12 Nov 2009 18:33:17 +1100
> Subject: [PATCH] modpost: autoconf.h has moved to include/generated
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Acked-by: Michal Marek <mmarek@xxxxxxx>.

Michal


> ---
> scripts/mod/modpost.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index f6be2e9..769ea95 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -15,7 +15,7 @@
> #include <stdio.h>
> #include <ctype.h>
> #include "modpost.h"
> -#include "../../include/linux/autoconf.h"
> +#include "../../include/generated/autoconf.h"
> #include "../../include/linux/license.h"
>
> /* Some toolchains use a `_' prefix for all user symbols. */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/