diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 17:12:32 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 17:12:32 +0300 |
| commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
| tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /arch/arm/mach-pxa/Kconfig | |
| parent | daa67b4b70568a07fef3cffacb2055891bf42ddb (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | linux-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.tar.xz | |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 8896e71586f5..f09683687963 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -691,4 +691,13 @@ config SHARPSL_PM_MAX1111 config PXA310_ULPI bool +config PXA_SYSTEMS_CPLDS + tristate "Motherboard cplds" + default ARCH_LUBBOCK || MACH_MAINSTONE + help + This driver supports the Lubbock and Mainstone multifunction chip + found on the pxa25x development platform system (Lubbock) and pxa27x + development platform system (Mainstone). This IO board supports the + interrupts handling, ethernet controller, flash chips, etc ... + endif |