diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 6 | ||||
-rw-r--r-- | arch/mips/include/asm/time.h | 2 | ||||
-rw-r--r-- | arch/mips/kernel/Makefile | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9b3759eef953..b04b4916aa3d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -55,7 +55,7 @@ config MIPS_ALCHEMY | |||
55 | bool "Alchemy processor based machines" | 55 | bool "Alchemy processor based machines" |
56 | select 64BIT_PHYS_ADDR | 56 | select 64BIT_PHYS_ADDR |
57 | select CEVT_R4K_LIB | 57 | select CEVT_R4K_LIB |
58 | select CSRC_R4K_LIB | 58 | select CSRC_R4K |
59 | select IRQ_CPU | 59 | select IRQ_CPU |
60 | select SYS_HAS_CPU_MIPS32_R1 | 60 | select SYS_HAS_CPU_MIPS32_R1 |
61 | select SYS_SUPPORTS_32BIT_KERNEL | 61 | select SYS_SUPPORTS_32BIT_KERNEL |
@@ -948,11 +948,7 @@ config CSRC_IOASIC | |||
948 | config CSRC_POWERTV | 948 | config CSRC_POWERTV |
949 | bool | 949 | bool |
950 | 950 | ||
951 | config CSRC_R4K_LIB | ||
952 | bool | ||
953 | |||
954 | config CSRC_R4K | 951 | config CSRC_R4K |
955 | select CSRC_R4K_LIB | ||
956 | bool | 952 | bool |
957 | 953 | ||
958 | config CSRC_SB1250 | 954 | config CSRC_SB1250 |
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index bc14447e69b5..6be93a468ec9 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) | |||
71 | /* | 71 | /* |
72 | * Initialize the count register as a clocksource | 72 | * Initialize the count register as a clocksource |
73 | */ | 73 | */ |
74 | #ifdef CONFIG_CSRC_R4K_LIB | 74 | #ifdef CONFIG_CSRC_R4K |
75 | extern int init_r4k_clocksource(void); | 75 | extern int init_r4k_clocksource(void); |
76 | #endif | 76 | #endif |
77 | 77 | ||
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 764597b5fb56..d9abe17b3556 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -25,7 +25,7 @@ obj-$(CONFIG_CEVT_TXX9) += cevt-txx9.o | |||
25 | obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o | 25 | obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o |
26 | obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o | 26 | obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o |
27 | obj-$(CONFIG_CSRC_POWERTV) += csrc-powertv.o | 27 | obj-$(CONFIG_CSRC_POWERTV) += csrc-powertv.o |
28 | obj-$(CONFIG_CSRC_R4K_LIB) += csrc-r4k.o | 28 | obj-$(CONFIG_CSRC_R4K) += csrc-r4k.o |
29 | obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o | 29 | obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o |
30 | obj-$(CONFIG_SYNC_R4K) += sync-r4k.o | 30 | obj-$(CONFIG_SYNC_R4K) += sync-r4k.o |
31 | 31 | ||