diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-12-18 10:22:27 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-12-18 10:22:27 +1100 |
| commit | 376bddd34433065aeb9b9a140870537feecf90ef (patch) | |
| tree | a40e2b84ad89f4b3ba968de65a4bf7ff6ccae835 /arch/powerpc/platforms/512x/Kconfig | |
| parent | d526e85f60fce9aa2a1432cbd06e3cf20c1644c8 (diff) | |
| parent | 667b504a2c411e4d5915a6e2260a3857ba9f797a (diff) | |
| download | linux-stable-376bddd34433065aeb9b9a140870537feecf90ef.tar.gz linux-stable-376bddd34433065aeb9b9a140870537feecf90ef.tar.bz2 linux-stable-376bddd34433065aeb9b9a140870537feecf90ef.zip | |
Merge remote-tracking branch 'agust/next' into next
Brings some 52xx updates. Also manually merged tools/perf/perf.h.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/512x/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/512x/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig index b62508b113db..c16999802ecf 100644 --- a/arch/powerpc/platforms/512x/Kconfig +++ b/arch/powerpc/platforms/512x/Kconfig @@ -2,7 +2,6 @@ config PPC_MPC512x bool "512x-based boards" depends on 6xx select FSL_SOC - select FB_FSL_DIU select IPIC select PPC_CLOCK select PPC_PCI_CHOICE |