"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.
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
