diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 16:47:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 16:47:15 -0700 |
commit | 1a9b4993b70fb1884716902774dc9025b457760d (patch) | |
tree | 83a3fa7011878ab4b7bef6857d4b481038a1e67e /arch/mips/txx9/Kconfig | |
parent | 1871e845e564c4e17f561ec4e5e4bb6bb8578685 (diff) | |
parent | 95cf1468f712df516cc471adcd1c861df4e3d371 (diff) | |
download | op-kernel-dev-1a9b4993b70fb1884716902774dc9025b457760d.zip op-kernel-dev-1a9b4993b70fb1884716902774dc9025b457760d.tar.gz |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"The lion share of this pull request are fixes for clk-related breakage
caused by other changes during this merge window. For some platforms
the fix was as simple as selecting HAVE_CLK, for others like the
Loongson 2 significant restructuring was required.
The remainder are changes required to get the Lantiq code to work
again."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Loongson 2: Sort out clock managment.
MIPS: Loongson 1: more clk support and add select HAVE_CLK
MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: Lantiq: Platform specific CLK fixup
MIPS: Lantiq: Add device_tree_init function
MIPS: Lantiq: Fix interface clock and PCI control register offset
Diffstat (limited to 'arch/mips/txx9/Kconfig')
-rw-r--r-- | arch/mips/txx9/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig index 852ae4b..6d40bc7 100644 --- a/arch/mips/txx9/Kconfig +++ b/arch/mips/txx9/Kconfig @@ -20,6 +20,7 @@ config MACH_TXX9 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN + select HAVE_CLK config TOSHIBA_JMR3927 bool "Toshiba JMR-TX3927 board" |