diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
| commit | a814290e17ae314bd614476cffc6119846eca27e (patch) | |
| tree | 9fc40e6a34cd275bedcd2344383bd5e84f6c20df /arch/arm/mach-pxa/Kconfig | |
| parent | e55d1936f207f81c4e225d6c513e0fa487e544c5 (diff) | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index fdb966e590a2..385c30ee3f23 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -37,6 +37,8 @@ config MACH_ZYLONITE320 | |||
| 37 | config MACH_LITTLETON | 37 | config MACH_LITTLETON |
| 38 | bool "PXA3xx Form Factor Platform (aka Littleton)" | 38 | bool "PXA3xx Form Factor Platform (aka Littleton)" |
| 39 | select PXA3xx | 39 | select PXA3xx |
| 40 | select CPU_PXA300 | ||
| 41 | select CPU_PXA310 | ||
| 40 | select PXA_SSP | 42 | select PXA_SSP |
| 41 | 43 | ||
| 42 | config MACH_TAVOREVB | 44 | config MACH_TAVOREVB |