diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 16:06:31 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 16:06:31 +0900 |
| commit | c488a4731abb53aa1bab9fccd8a7472083159bfd (patch) | |
| tree | db6d4a664a1e4b7685c1d2d79da63263f40adf7b /arch/x86/xen/Makefile | |
| parent | 6d2ae89c36e2adab5cfa69fecb11290082817ac6 (diff) | |
| parent | bba958783b1b4cb0a9420f4e11082467132a334c (diff) | |
| download | linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.tar.gz linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.tar.bz2 linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.zip | |
Merge branch 'common/mmcif' into rmobile-latest
Diffstat (limited to 'arch/x86/xen/Makefile')
| -rw-r--r-- | arch/x86/xen/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 779385158915..17c565de3d64 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -12,7 +12,8 @@ CFLAGS_mmu.o := $(nostackp) obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ - grant-table.o suspend.o platform-pci-unplug.o + grant-table.o suspend.o platform-pci-unplug.o \ + p2m.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o |