diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 00:53:55 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 00:53:55 -0500 |
| commit | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (patch) | |
| tree | 11e9d240d87834f9da927aaa4027e7dfcbd01eb8 /arch/powerpc/platforms/52xx | |
| parent | d891ea23d5203e5c47439b2a174f86a00b356a6c (diff) | |
| parent | bc75059422338197ce487d338ac9c898761e1e61 (diff) | |
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 @@ | |||
| 1 | config PPC_MPC52xx | 1 | config PPC_MPC52xx |
| 2 | bool "52xx-based boards" | 2 | bool "52xx-based boards" |
| 3 | depends on 6xx | 3 | depends on 6xx |
| 4 | select PPC_CLOCK | 4 | select COMMON_CLK |
| 5 | select PPC_PCI_CHOICE | 5 | select PPC_PCI_CHOICE |
| 6 | 6 | ||
| 7 | config PPC_MPC5200_SIMPLE | 7 | config PPC_MPC5200_SIMPLE |