mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 04:17:47 +00:00
322aafa664
* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
x86, mrst: Fix whitespace breakage in apb_timer.c
x86, mrst: Fix APB timer per cpu clockevent
x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC
x86, olpc: Use pci subarch init for OLPC
x86, pci: Add arch_init to x86_init abstraction
x86, mrst: Add Kconfig dependencies for Moorestown
x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n
x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI
x86, pci: Add sanity check for PCI fixed bar probing
x86, legacy_irq: Remove duplicate vector assigment
x86, legacy_irq: Remove left over nr_legacy_irqs
x86, mrst: Platform clock setup code
x86, apbt: Moorestown APB system timer driver
x86, mrst: Add vrtc platform data setup code
x86, mrst: Add platform timer info parsing code
x86, mrst: Fill in PCI functions in x86_init layer
x86, mrst: Add dummy legacy pic to platform setup
x86/PCI: Moorestown PCI support
x86, ioapic: Add dummy ioapic functions
x86, ioapic: Early enable ioapic for timer irq
...
Fixed up semantic conflict of new clocksources due to commit
17622339af ("clocksource: add argument to resume callback").
24 lines
523 B
Makefile
24 lines
523 B
Makefile
obj-y := i386.o init.o
|
|
|
|
obj-$(CONFIG_PCI_BIOS) += pcbios.o
|
|
obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o
|
|
obj-$(CONFIG_PCI_DIRECT) += direct.o
|
|
obj-$(CONFIG_PCI_OLPC) += olpc.o
|
|
|
|
obj-y += fixup.o
|
|
obj-$(CONFIG_ACPI) += acpi.o
|
|
obj-y += legacy.o irq.o
|
|
|
|
obj-$(CONFIG_X86_VISWS) += visws.o
|
|
|
|
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
|
|
|
|
obj-$(CONFIG_X86_MRST) += mrst.o
|
|
|
|
obj-y += common.o early.o
|
|
obj-y += amd_bus.o bus_numa.o
|
|
|
|
ifeq ($(CONFIG_PCI_DEBUG),y)
|
|
EXTRA_CFLAGS += -DDEBUG
|
|
endif
|