diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-davinci/Kconfig | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-davinci/Kconfig')
| -rw-r--r-- | arch/arm/mach-davinci/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 0ebe185610bf..0316e201ada0 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
| @@ -7,6 +7,7 @@ config CP_INTC | |||
| 7 | bool | 7 | bool |
| 8 | 8 | ||
| 9 | config ARCH_DAVINCI_DMx | 9 | config ARCH_DAVINCI_DMx |
| 10 | select CPU_ARM926T | ||
| 10 | bool | 11 | bool |
| 11 | 12 | ||
| 12 | menu "TI DaVinci Implementations" | 13 | menu "TI DaVinci Implementations" |
| @@ -41,6 +42,7 @@ config ARCH_DAVINCI_DA850 | |||
| 41 | select ARCH_HAS_CPUFREQ | 42 | select ARCH_HAS_CPUFREQ |
| 42 | 43 | ||
| 43 | config ARCH_DAVINCI_DA8XX | 44 | config ARCH_DAVINCI_DA8XX |
| 45 | select CPU_ARM926T | ||
| 44 | bool | 46 | bool |
| 45 | 47 | ||
| 46 | config ARCH_DAVINCI_DM365 | 48 | config ARCH_DAVINCI_DM365 |