diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 08:04:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 08:04:26 -0400 |
commit | a93f3e9f424ffb82b4983d2ebf8667ef20255015 (patch) | |
tree | 7e1f9b0092289b59b20ac8d70261d8dc68e64b4b /arch/x86/Kconfig | |
parent | 107095a9463dc1c64168c7e6592d3a47c474fec8 (diff) | |
parent | d4f3e350172a1dc769ed5e7f5bd540feb0c475d8 (diff) |
Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: geode: New PCEngines Alix system driver
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f49767716c7..16db864c42b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -2066,6 +2066,20 @@ config OLPC_XO15_SCI | |||
2066 | - AC adapter status updates | 2066 | - AC adapter status updates |
2067 | - Battery status updates | 2067 | - Battery status updates |
2068 | 2068 | ||
2069 | config ALIX | ||
2070 | bool "PCEngines ALIX System Support (LED setup)" | ||
2071 | select GPIOLIB | ||
2072 | ---help--- | ||
2073 | This option enables system support for the PCEngines ALIX. | ||
2074 | At present this just sets up LEDs for GPIO control on | ||
2075 | ALIX2/3/6 boards. However, other system specific setup should | ||
2076 | get added here. | ||
2077 | |||
2078 | Note: You must still enable the drivers for GPIO and LED support | ||
2079 | (GPIO_CS5535 & LEDS_GPIO) to actually use the LEDs | ||
2080 | |||
2081 | Note: You have to set alix.force=1 for boards with Award BIOS. | ||
2082 | |||
2069 | endif # X86_32 | 2083 | endif # X86_32 |
2070 | 2084 | ||
2071 | config AMD_NB | 2085 | config AMD_NB |