diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:52:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:52:01 -0400 |
| commit | cca8209ed962f87990345ba073979d2b55dd1187 (patch) | |
| tree | 7629ee8d3396396570bdc35cc4220322c18c71cc /arch/x86/kernel/Makefile | |
| parent | d77bdc423d6d6efcd18d329bbf8eb9351953dd30 (diff) | |
| parent | 9e9006e9090dc1f88d5127cb69f416013e7ecd60 (diff) | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: XO-1 uses/depends on PCI
x86, olpc: Register XO-1 platform devices
x86, olpc: Add XO-1 poweroff support
x86, olpc: Don't retry EC commands forever
x86, olpc: Rework BIOS signature check
x86, olpc: Only enable PCI configuration type override on XO-1
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4370154f4122..3323c6404035 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -108,6 +108,7 @@ obj-$(CONFIG_SCx200) += scx200.o | |||
| 108 | scx200-y += scx200_32.o | 108 | scx200-y += scx200_32.o |
| 109 | 109 | ||
| 110 | obj-$(CONFIG_OLPC) += olpc.o | 110 | obj-$(CONFIG_OLPC) += olpc.o |
| 111 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | ||
| 111 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o | 112 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o |
| 112 | obj-$(CONFIG_X86_MRST) += mrst.o | 113 | obj-$(CONFIG_X86_MRST) += mrst.o |
| 113 | 114 | ||