aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/platform/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-28 05:04:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-28 05:04:26 -0700
commita93f3e9f424ffb82b4983d2ebf8667ef20255015 (patch)
tree7e1f9b0092289b59b20ac8d70261d8dc68e64b4b /arch/x86/platform/Makefile
parent107095a9463dc1c64168c7e6592d3a47c474fec8 (diff)
parentd4f3e350172a1dc769ed5e7f5bd540feb0c475d8 (diff)
Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: geode: New PCEngines Alix system driver
Diffstat (limited to 'arch/x86/platform/Makefile')
-rw-r--r--arch/x86/platform/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 021eee91c05..8d874396cb2 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1,6 +1,7 @@
# Platform specific code goes here
obj-y += ce4100/
obj-y += efi/
+obj-y += geode/
obj-y += iris/
obj-y += mrst/
obj-y += olpc/