From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 20:47:54 +0000 (-0700)
Subject: Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~202
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=87affd0b9416d8f43d2d4de1f3fdfbe7f3559380;hp=-c

Merge branch 'x86-mrst-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: sfi: Make local functions static
  x86, earlyprintk: Add hsu early console for Intel Medfield platform
  x86, earlyprintk: Add earlyprintk for Intel Moorestown platform
  x86: Add two helper macros for fixed address mapping
  x86, mrst: A function in a header file needs to be marked "inline"
---

87affd0b9416d8f43d2d4de1f3fdfbe7f3559380
diff --combined arch/x86/kernel/Makefile
index f49257e33805,3cd01d04613d..4370154f4122
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -34,8 -34,7 +34,8 @@@ GCOV_PROFILE_paravirt.o		:= 
  obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o
  obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
  obj-y			+= time.o ioport.o ldt.o dumpstack.o
 -obj-y			+= setup.o x86_init.o i8259.o irqinit.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
@@@ -86,11 -85,12 +86,12 @@@ obj-$(CONFIG_DOUBLEFAULT) 	+= doublefau
  obj-$(CONFIG_KGDB)		+= kgdb.o
  obj-$(CONFIG_VM86)		+= vm86_32.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+ obj-$(CONFIG_EARLY_PRINTK_MRST)	+= early_printk_mrst.o
  
  obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
  obj-$(CONFIG_APB_TIMER)		+= apb_timer.o
  
 -obj-$(CONFIG_K8_NB)		+= k8.o
 +obj-$(CONFIG_AMD_NB)		+= amd_nb.o
  obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o
  obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o
  
@@@ -123,6 -123,7 +124,6 @@@ obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb.
  # 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_X86_PM_TIMER)	+= pmtimer_64.o
  	obj-$(CONFIG_AUDIT)		+= audit_64.o
  
  	obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o