"Paolo 'Blaisorblade' Giarrusso" <[email protected]> wrote:
>
> arch/i386/Kconfig | 304 ------------------------------------------------
> arch/i386/Kconfig.cpu | 305 ++++++++++++++++++++++++++++++++++++++++++++++++
Have mercy. I currently have twelve patches which alter arch/i386/Kconfig
and this patch conflicts with most of them. This shouldn't come as a
surprise - Kconfig files are oft-patched, and this is x86.
What I did was to simply copy the large block between
if !X86_ELAN
and
config X86_OOSTORE
over into Kconfig.cpu, taking the modifications with it.
As long as that's also what you did things should work OK. If you actually
made any changes as you did the copy-and-paste, we're screwed.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
