diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:51:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:51:02 -0700 |
| commit | 32c15bb978c0e6ff65b3012a6af5a14c899005ce (patch) | |
| tree | 29b40c7dc083a1f0e3fb199963e88bb73c8b6ea7 /arch/mips/pmc-sierra/Kconfig | |
| parent | 53253383fde9e41bc07ad4d99f1c8b537fef71d6 (diff) | |
| parent | 42f77542f4a1c104bb6fbba2e18e04e84415a96b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Move R4000 clockevent device code to separate configurable file
[MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
[MIPS] IP32: Retire use of plat_timer_setup.
[MIPS] Jazz: Retire use of plat_timer_setup.
[MIPS] IP27: Convert to clock_event_device.
[MIPS] JMR3927: Convert to clock_event_device.
[MIPS] Always do the ARC64_TWIDDLE_PC thing.
Diffstat (limited to 'arch/mips/pmc-sierra/Kconfig')
| -rw-r--r-- | arch/mips/pmc-sierra/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/pmc-sierra/Kconfig b/arch/mips/pmc-sierra/Kconfig index abbd0bbfabd..6b293ce0935 100644 --- a/arch/mips/pmc-sierra/Kconfig +++ b/arch/mips/pmc-sierra/Kconfig @@ -4,11 +4,13 @@ choice config PMC_MSP4200_EVAL bool "PMC-Sierra MSP4200 Eval Board" + select CEVT_R4K select IRQ_MSP_SLP select HW_HAS_PCI config PMC_MSP4200_GW bool "PMC-Sierra MSP4200 VoIP Gateway" + select CEVT_R4K select IRQ_MSP_SLP select HW_HAS_PCI |