diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 18:19:13 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 18:19:21 +0100 |
commit | 51ddafcbc735155a7e946b8b6ff19fcd5351375b (patch) | |
tree | 4900cfc546494d84cdbf0b693d89b5a130d5f0ee /arch/x86/platform/iris/Makefile | |
parent | Merge branch 'x86/amd-nb' into x86/apic-cleanups (diff) | |
parent | x86, earlyprintk: Move mrst early console to platform/ and fix a typo (diff) | |
download | linux-51ddafcbc735155a7e946b8b6ff19fcd5351375b.tar.xz linux-51ddafcbc735155a7e946b8b6ff19fcd5351375b.zip |
Merge branch 'x86/platform' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/platform/iris/Makefile')
-rw-r--r-- | arch/x86/platform/iris/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/iris/Makefile b/arch/x86/platform/iris/Makefile new file mode 100644 index 000000000000..db921983a102 --- /dev/null +++ b/arch/x86/platform/iris/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_32_IRIS) += iris.o |