diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 17:25:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 17:25:04 -0400 |
| commit | 3c437430f1493b77f5fd3cbc1473b7bdc9686b91 (patch) | |
| tree | b84a00adee384bfa8b8b2c6c2a488b7bbae0340b /arch/arm/mach-shmobile/Kconfig | |
| parent | a515be1ca7df947db0f6018a174f49507affcdbc (diff) | |
| parent | e6bf705911a0b64c589b6c408a316e7d465acbbd (diff) | |
Merge branch 'renesas-armadillo800eva' into renesas-board-new
* renesas-armadillo800eva:
ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index e703bd280f98..054f1a3a43cb 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -97,6 +97,7 @@ config MACH_ARMADILLO800EVA | |||
| 97 | bool "Armadillo-800 EVA board" | 97 | bool "Armadillo-800 EVA board" |
| 98 | depends on ARCH_R8A7740 | 98 | depends on ARCH_R8A7740 |
| 99 | select ARCH_REQUIRE_GPIOLIB | 99 | select ARCH_REQUIRE_GPIOLIB |
| 100 | select USE_OF | ||
| 100 | 101 | ||
| 101 | config MACH_MARZEN | 102 | config MACH_MARZEN |
| 102 | bool "MARZEN board" | 103 | bool "MARZEN board" |