diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
| commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
| tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /arch/powerpc/Kconfig | |
| parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
| parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) | |
| download | talos-op-linux-be6bfc29bc759670fb3a2519325c4ab2edf259c9.tar.gz talos-op-linux-be6bfc29bc759670fb3a2519325c4ab2edf259c9.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 6e03f85b11cd..405ce42c8ff7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1076,8 +1076,6 @@ source "drivers/Kconfig" source "fs/Kconfig" -source "arch/powerpc/sysdev/qe_lib/Kconfig" - source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" |
