diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 16:14:17 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 16:14:17 (GMT) |
| commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
| tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-mmp/Kconfig | |
| parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
| parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) | |
| download | linux-fsl-qoriq-244acb1ba3777c2eb4d33ddc246cab5419656442.tar.xz | |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-mmp/Kconfig')
| -rw-r--r-- | arch/arm/mach-mmp/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index d697d07..178d4da 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -107,22 +107,22 @@ endmenu config CPU_PXA168 bool - select CPU_MOHAWK select COMMON_CLK + select CPU_MOHAWK help Select code specific to PXA168 config CPU_PXA910 bool - select CPU_MOHAWK select COMMON_CLK + select CPU_MOHAWK help Select code specific to PXA910 config CPU_MMP2 bool - select CPU_PJ4 select COMMON_CLK + select CPU_PJ4 help Select code specific to MMP2. MMP2 is ARMv7 compatible. |