diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /arch/arm/mach-mx3/Kconfig | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'arch/arm/mach-mx3/Kconfig')
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index 17a21a291e2f..851f2458bf65 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig | |||
| @@ -36,6 +36,14 @@ config MACH_PCM037 | |||
| 36 | Include support for Phytec pcm037 platform. This includes | 36 | Include support for Phytec pcm037 platform. This includes |
| 37 | specific configurations for the board and its peripherals. | 37 | specific configurations for the board and its peripherals. |
| 38 | 38 | ||
| 39 | config MACH_PCM037_EET | ||
| 40 | bool "Support pcm037 EET board extensions" | ||
| 41 | depends on MACH_PCM037 | ||
| 42 | help | ||
| 43 | Add support for PCM037 EET baseboard extensions. If you are using the | ||
| 44 | OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel | ||
| 45 | command-line parameter. | ||
| 46 | |||
| 39 | config MACH_MX31LITE | 47 | config MACH_MX31LITE |
| 40 | bool "Support MX31 LITEKIT (LogicPD)" | 48 | bool "Support MX31 LITEKIT (LogicPD)" |
| 41 | select ARCH_MX31 | 49 | select ARCH_MX31 |