[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100106163113.637e47db.akpm@linux-foundation.org>
Date: Wed, 6 Jan 2010 16:31:13 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Phillip Lougher <phillip@...gher.demon.co.uk>
Cc: linux-embedded@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kernel@...r.kernel.org, phillip.lougher@...il.com,
tim.bird@...sony.com, Stephen Rothwell <sfr@...b.auug.org.au>,
Albin Tonnerre <albin.tonnerre@...e-electrons.com>
Subject: Re: [PATCH V2 6/8] lzma: Make lzma available to non
initramfs/initrd code
On Thu, 07 Jan 2010 00:20:24 +0000
Phillip Lougher <phillip@...gher.demon.co.uk> wrote:
> Andrew Morton wrote:
>
> > So what to do? I guess I could go ahead with the mainline merge, and
> > Stephen drops <whatever that tree was> from linux-next until it has
> > been fixed up?
> >
>
> Yes, I'm happy with that. The following patch is the necessary fix
> that needs to go into linux-next when you've gone ahead with the
> mainline merge of the lib-add-support-for-lzo-compressed-kernels.patch.
ooh, goody, thanks.
> diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
> index db521f4..edd82c3 100644
> --- a/lib/decompress_unlzo.c
> +++ b/lib/decompress_unlzo.c
> @@ -39,6 +39,7 @@
>
> #include <linux/types.h>
> #include <linux/lzo.h>
> +#include <linux/decompress/unlzo_mm.h>
> #include <linux/decompress/mm.h>
>
> #include <linux/compiler.h>
Your email client is doing space-stuffing.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists