diff options
| author | Benjamin Herrenschmidt | 2014-01-29 06:53:55 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2014-01-29 06:53:55 +0100 |
| commit | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (patch) | |
| tree | 11e9d240d87834f9da927aaa4027e7dfcbd01eb8 /arch/powerpc/platforms/52xx | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | powerpc/512x: dts: add MPC5125 clock specs (diff) | |
| download | kernel-qcow2-linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.gz kernel-qcow2-linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.xz kernel-qcow2-linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.zip | |
Merge remote-tracking branch 'agust/next' into next
<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>
Diffstat (limited to 'arch/powerpc/platforms/52xx')
| -rw-r--r-- | arch/powerpc/platforms/52xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig index af54174801f7..b625a2c6f4f2 100644 --- a/arch/powerpc/platforms/52xx/Kconfig +++ b/arch/powerpc/platforms/52xx/Kconfig @@ -1,7 +1,7 @@ config PPC_MPC52xx bool "52xx-based boards" depends on 6xx - select PPC_CLOCK + select COMMON_CLK select PPC_PCI_CHOICE config PPC_MPC5200_SIMPLE |