Blackfin arch: unify cplbinfo files

Merge MPU and noMPU version of CPLB info code to one common version. Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
git-mirror · Nov 18, 2008 · ff4c02e · ff4c02e
1 parent 4db557d
commit ff4c02e
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 363 deletions.
diff --git a/arch/blackfin/kernel/Makefile b/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/arch/blackfin/kernel/cplb-mpu/Makefile b/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/arch/blackfin/kernel/cplb-mpu/cplbinfo.c b/arch/blackfin/kernel/cplb-mpu/cplbinfo.c
diff --git a/arch/blackfin/kernel/cplb-nompu/Makefile b/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/arch/blackfin/kernel/cplb-nompu/cplbinfo.c b/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