diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile
index 2db98c2..a4567c9 100644
--- a/drivers/lguest/Makefile
+++ b/drivers/lguest/Makefile
@@ -3,8 +3,10 @@
 
 # Host requires the other files, which can be a module.
 obj-$(CONFIG_LGUEST)	+= lg.o
-lg-y := core.o hypercalls.o page_tables.o interrupts_and_traps.o \
-	segments.o io.o lguest_user.o switcher.o
+lg-y = core.o hypercalls.o page_tables.o interrupts_and_traps.o \
+	segments.o io.o lguest_user.o
+
+lg-$(CONFIG_X86_32) += x86/switcher_32.o
 
 Preparation Preparation!: PREFIX=P
 Guest: PREFIX=G