git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
52xx
/
Kconfig
diff --git
a/arch/powerpc/platforms/52xx/Kconfig
b/arch/powerpc/platforms/52xx/Kconfig
index bc4aa4a80a124c5501b1dd9d60698052b9bbd2bb..3ffaa066c2c8b5660863d76647e8500b40d84235 100644
(file)
--- a/
arch/powerpc/platforms/52xx/Kconfig
+++ b/
arch/powerpc/platforms/52xx/Kconfig
@@
-1,5
+1,6
@@
config PPC_MPC52xx
bool
+ select FSL_SOC
default n
config PPC_MPC5200