[PATCH] MIPS: Remove usage of CSRC_R4K_LIB config option.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] MIPS: Remove usage of CSRC_R4K_LIB config option.

Steven J. Hill-3
From: "Steven J. Hill" <[hidden email]>

The CSRC_R4K_LIB is redundant and can safely be removed.

Signed-off-by: Steven J. Hill <[hidden email]>
---
 arch/mips/Kconfig            |    6 +-----
 arch/mips/include/asm/time.h |    2 +-
 arch/mips/kernel/Makefile    |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index dba9390..40cb646 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -54,7 +54,7 @@ config MIPS_ALCHEMY
  bool "Alchemy processor based machines"
  select 64BIT_PHYS_ADDR
  select CEVT_R4K_LIB
- select CSRC_R4K_LIB
+ select CSRC_R4K
  select IRQ_CPU
  select SYS_HAS_CPU_MIPS32_R1
  select SYS_SUPPORTS_32BIT_KERNEL
@@ -946,11 +946,7 @@ config CSRC_IOASIC
 config CSRC_POWERTV
  bool
 
-config CSRC_R4K_LIB
- bool
-
 config CSRC_R4K
- select CSRC_R4K_LIB
  bool
 
 config CSRC_SB1250
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index bc14447..6be93a4 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -71,7 +71,7 @@ static inline int mips_clockevent_init(void)
 /*
  * Initialize the count register as a clocksource
  */
-#ifdef CONFIG_CSRC_R4K_LIB
+#ifdef CONFIG_CSRC_R4K
 extern int init_r4k_clocksource(void);
 #endif
 
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 8b28bc4..e4260b6 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_CEVT_TXX9) += cevt-txx9.o
 obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o
 obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o
 obj-$(CONFIG_CSRC_POWERTV) += csrc-powertv.o
-obj-$(CONFIG_CSRC_R4K_LIB) += csrc-r4k.o
+obj-$(CONFIG_CSRC_R4K) += csrc-r4k.o
 obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o
 obj-$(CONFIG_SYNC_R4K) += sync-r4k.o
 
--
1.7.9.5