diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:25:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:25:42 -0700 |
| commit | 2d3b07c07b39c4b7d9b6641052a02d996cd5d87c (patch) | |
| tree | 38f0e2865cc6c1eac3311cdf7539853afd222f4b /arch/x86/platform/olpc/Makefile | |
| parent | 150cd843fac0160fce616fb3e5cbe64e9db7481e (diff) | |
| parent | 8654b1c2de1465120974899fc1c8aa00e91d4b7e (diff) | |
| download | talos-op-linux-2d3b07c07b39c4b7d9b6641052a02d996cd5d87c.tar.gz talos-op-linux-2d3b07c07b39c4b7d9b6641052a02d996cd5d87c.zip | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Move olpc to platform
x86: Move uv to platform
x86: Move mrst to platform
x86: Move scx200 to platform
x86: Move visws to platform
x86: Move efi to platform
x86: Move sfi to platform
x86: Add platform directory
Diffstat (limited to 'arch/x86/platform/olpc/Makefile')
| -rw-r--r-- | arch/x86/platform/olpc/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile new file mode 100644 index 000000000000..c31b8fcb5a86 --- /dev/null +++ b/arch/x86/platform/olpc/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_OLPC) += olpc.o +obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o +obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o |
