From 695d14ec5c897f1fb168be7eb285114ff8ab7789 Mon Sep 17 00:00:00 2001
From: Sarah Nadi <snadi@uwaterloo.ca>
Date: Tue, 17 May 2011 10:38:43 -0400
Subject: [PATCH] --- yaml --- r: 248582 b: refs/heads/master c:
 9e76a7ac87c13bb7515e5d7652bbb6bda4733b6e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/cris/arch-v32/mach-fs/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c77659566dc3..a8fbe98cab05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cffbcd0c23bf17c411b35d13fceb25bd5ec9afea
+refs/heads/master: 9e76a7ac87c13bb7515e5d7652bbb6bda4733b6e
diff --git a/trunk/arch/cris/arch-v32/mach-fs/Makefile b/trunk/arch/cris/arch-v32/mach-fs/Makefile
index 4ff407a1b931..41fa6a6893a9 100644
--- a/trunk/arch/cris/arch-v32/mach-fs/Makefile
+++ b/trunk/arch/cris/arch-v32/mach-fs/Makefile
@@ -4,7 +4,7 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
+obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
 obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean: