diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 21:08:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 21:08:06 -0400 |
| commit | 08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86 (patch) | |
| tree | 0d087f009b80bdf54f22fdb78437af790c1afc27 /arch/x86/Kconfig | |
| parent | 13588209aa90d9c8e502750fc86160314555612f (diff) | |
| parent | 5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Introduce pci_map_biosrom()
x86, olpc: Use device tree for platform identification
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0a1fe60037f2..4168e5d8632a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -2069,7 +2069,7 @@ config OLPC | |||
| 2069 | depends on !X86_PAE | 2069 | depends on !X86_PAE |
| 2070 | select GPIOLIB | 2070 | select GPIOLIB |
| 2071 | select OF | 2071 | select OF |
| 2072 | select OF_PROMTREE if PROC_DEVICETREE | 2072 | select OF_PROMTREE |
| 2073 | ---help--- | 2073 | ---help--- |
| 2074 | Add support for detecting the unique features of the OLPC | 2074 | Add support for detecting the unique features of the OLPC |
| 2075 | XO hardware. | 2075 | XO hardware. |