Merge branch 'x86-platform-for-linus' of...

obj-y += vdso/

obj-$(CONFIG_IA32_EMULATION) += ia32/

obj-y += platform/

obj-y			+= time.o ioport.o ldt.o dumpstack.o

obj-y			+= setup.o x86_init.o i8259.o irqinit.o jump_label.o

obj-$(CONFIG_IRQ_WORK)  += irq_work.o

obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-y				+= cpu/

obj-y				+= acpi/

obj-$(CONFIG_SFI)		+= sfi.o

obj-y				+= reboot.o

obj-$(CONFIG_MCA)		+= mca_32.o

obj-$(CONFIG_X86_MSR)		+= msr.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o

obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o

obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_VM86)		+= vm86_32.o

obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o

obj-$(CONFIG_SCx200)		+= scx200.o

scx200-y			+= scx200_32.o

obj-$(CONFIG_OLPC)		+= olpc.o

obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o

obj-$(CONFIG_OLPC_OPENFIRMWARE)	+= olpc_ofw.o

obj-$(CONFIG_X86_MRST)		+= mrst.o

microcode-y				:= microcode_core.o

microcode-$(CONFIG_MICROCODE_INTEL)	+= microcode_intel.o

microcode-$(CONFIG_MICROCODE_AMD)	+= microcode_amd.o

###

# 64 bit specific files

ifeq ($(CONFIG_X86_64),y)

	obj-$(CONFIG_X86_UV)		+= tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o

	obj-$(CONFIG_AUDIT)		+= audit_64.o

	obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o

# Platform specific code goes here

obj-y	+= efi/

obj-y	+= mrst/

obj-y	+= olpc/

obj-y	+= scx200/

obj-y	+= sfi/

obj-y	+= visws/

obj-y	+= uv/

obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o