Re: "Read my lips: no more merges" - aka Linux 2.6.14-rc1

[Horst von Brand]

After the big "no more merges" push of stuff into 2.6.14-rc1 on i686 I get:

   arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
   : undefined reference to `disable_timer_pin_1'
   arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
   : undefined reference to `disable_timer_pin_1'
   arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
   : undefined reference to `disable_timer_pin_1'

In io_apic.c there is an:

   int disable_timer_pin_1 __initdata;

but that file isn't compiled here, as CONFIG_X86_IO_APIC isn't set; while
the pieces that reference this are protected by CONFIG_X86_LOCAL_APIC. An
option changed name, perhaps?
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513

-
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/