diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /arch/arm/configs | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/da8xx_omapl_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index ba6670556f78..cdc40c4b8c48 100644 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ b/arch/arm/configs/da8xx_omapl_defconfig | |||
| @@ -17,6 +17,8 @@ CONFIG_MODVERSIONS=y | |||
| 17 | CONFIG_ARCH_DAVINCI=y | 17 | CONFIG_ARCH_DAVINCI=y |
| 18 | CONFIG_ARCH_DAVINCI_DA830=y | 18 | CONFIG_ARCH_DAVINCI_DA830=y |
| 19 | CONFIG_ARCH_DAVINCI_DA850=y | 19 | CONFIG_ARCH_DAVINCI_DA850=y |
| 20 | CONFIG_MACH_MITYOMAPL138=y | ||
| 21 | CONFIG_MACH_OMAPL138_HAWKBOARD=y | ||
| 20 | CONFIG_DAVINCI_RESET_CLOCKS=y | 22 | CONFIG_DAVINCI_RESET_CLOCKS=y |
| 21 | CONFIG_NO_HZ=y | 23 | CONFIG_NO_HZ=y |
| 22 | CONFIG_HIGH_RES_TIMERS=y | 24 | CONFIG_HIGH_RES_TIMERS=y |
| @@ -79,6 +81,7 @@ CONFIG_I2C_DAVINCI=y | |||
| 79 | # CONFIG_HWMON is not set | 81 | # CONFIG_HWMON is not set |
| 80 | CONFIG_WATCHDOG=y | 82 | CONFIG_WATCHDOG=y |
| 81 | CONFIG_REGULATOR=y | 83 | CONFIG_REGULATOR=y |
| 84 | CONFIG_REGULATOR_DUMMY=y | ||
| 82 | CONFIG_REGULATOR_TPS6507X=y | 85 | CONFIG_REGULATOR_TPS6507X=y |
| 83 | CONFIG_FB=y | 86 | CONFIG_FB=y |
| 84 | CONFIG_FB_DA8XX=y | 87 | CONFIG_FB_DA8XX=y |