1/3: merge std_resources.c back into setup.c
Hi Andrew.
std_resources.{c,h} was only split off due to pc9800 wanting to override it. With it gone, it might as well be merged back in. Doesn't change any code. It was compiled and booted.
This time this also actually doesn't break compilation of any of the subarches. That's to say, any further. I guess it might have been my .config (my regular PC config, with just the subarch switched through menuconfig) or O=, but only ELAN actually compiled. Voyager and VISWS bombed out at the final link and NUMAQ much sooner (with "physnode_map undeclared" during compilation of numaq.c).
Rene.
arch/i386/Kconfig +0 -6
@@ -1518,12 +1518,6 @@ depends on X86_SMP || (X86_VOYAGER && SMP) default y -# std_resources is overridden for pc9800, but that's not -# a currently selectable arch choice -config X86_STD_RESOURCES - bool - default y - config PC bool depends on X86 && !EMBEDDED
arch/i386/kernel/Makefile +0 -1
@@ -32,7 +32,6 @@ obj-$(CONFIG_HPET_TIMER) += time_hpet.o obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_X86_STD_RESOURCES) += std_resources.o EXTRA_AFLAGS := -traditional
arch/i386/kernel/setup.c +200 -5
231 lines not on this page · raw message
arch/i386/kernel/std_resources.c +0 -204
204 lines not on this page · raw message
include/asm-i386/std_resources.h +0 -14
@@ -1,14 +0,0 @@ -/* -* include/asm-i386/std_resources.h -*/ - -#ifndef __ASM_I386_STD_RESOURCES_H -#define __ASM_I386_STD_RESOURCES_H - -#include <linux/init.h> - -void probe_roms (void )__init ; -void request_graphics_resource (void )__init ; -void request_standard_io_resources (void )__init ; - -#endif