Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[linux-2.6-microblaze.git] / arch / x86 / platform / olpc / Makefile

diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile
index e797428..c2a8cab 100644 (file)
--- a/arch/x86/platform/olpc/Makefile
+++ b/arch/x86/platform/olpc/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_OLPC)             += olpc.o
 obj-$(CONFIG_OLPC_XO1)         += olpc-xo1.o
-obj-$(CONFIG_OLPC_OPENFIRMWARE)        += olpc_ofw.o
-obj-$(CONFIG_OLPC_OPENFIRMWARE_DT)     += olpc_dt.o
+obj-$(CONFIG_OLPC)             += olpc_ofw.o
+obj-$(CONFIG_OF_PROMTREE)      += olpc_dt.o