---

yaml --- r: 127055 b: refs/heads/master c: ff4c02e h: refs/heads/master i: 127053: 19a11ab 127051: ca2ee7d 127047: 38c8c97 127039: 47257d9 v: v3
git-mirror · Nov 18, 2008 · f3cdbda · f3cdbda
1 parent 5202e67
commit f3cdbda
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 364 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4db557d4aeb6a9a6713e66e222949bc93b2bf2e9
+refs/heads/master: ff4c02e4be00dccfb4b7baa8e56300b6ab3e290a
diff --git a/trunk/arch/blackfin/kernel/Makefile b/trunk/arch/blackfin/kernel/Makefile
@@ -16,6 +16,7 @@ else
 endif
 
 obj-$(CONFIG_BFIN_GPTIMERS)          += gptimers.o
+obj-$(CONFIG_CPLB_INFO)              += cplbinfo.o
 obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_KGDB)                   += kgdb.o
 obj-$(CONFIG_EARLY_PRINTK)           += early_printk.o
diff --git a/trunk/arch/blackfin/kernel/cplb-mpu/Makefile b/trunk/arch/blackfin/kernel/cplb-mpu/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-y := cplbinit.o cacheinit.o cplbmgr.o
-
-obj-$(CONFIG_CPLB_INFO) += cplbinfo.o
-
diff --git a/trunk/arch/blackfin/kernel/cplb-mpu/cplbinfo.c b/trunk/arch/blackfin/kernel/cplb-mpu/cplbinfo.c
diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/Makefile b/trunk/arch/blackfin/kernel/cplb-nompu/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-y := cplbinit.o cacheinit.o cplbhdlr.o cplbmgr.o
-
-obj-$(CONFIG_CPLB_INFO) += cplbinfo.o
-
diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,3 @@
		#

		obj-y := cplbinit.o cacheinit.o cplbmgr.o

		obj-$(CONFIG_CPLB_INFO) += cplbinfo.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,3 @@
		#

		obj-y := cplbinit.o cacheinit.o cplbhdlr.o cplbmgr.o

		obj-$(CONFIG_CPLB_INFO) += cplbinfo.o