diff options
author | Andres Salomon <dilinger@queued.net> | 2010-11-29 18:45:06 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-14 06:38:15 -0500 |
commit | 419cdc54ea597d307fade607a65e4885634eb8c8 (patch) | |
tree | c41ee78ddde8d4de5839f0cee20f769be6f162af /arch/x86/Kconfig | |
parent | cdd137c9c86c201ddb7f42ec978d2da45e7b7a17 (diff) |
x86: OLPC: convert olpc-xo1 driver from pci device to platform device
The cs5535-mfd driver now takes care of the PCI BAR handling; this
means the olpc-xo1 driver shouldn't be touching the PCI device at all.
This patch uses both cs5535-acpi and cs5535-pms platform devices rather
than a single platform device because the cs5535-mfd driver may be used
by other CS5535 platform-specific drivers; OLPC doesn't get to dictate
that ACPI and PMS will always be used together.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
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 36ed2e2c896b..50aa81f2ffc4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -2068,7 +2068,7 @@ config OLPC | |||
2068 | 2068 | ||
2069 | config OLPC_XO1 | 2069 | config OLPC_XO1 |
2070 | tristate "OLPC XO-1 support" | 2070 | tristate "OLPC XO-1 support" |
2071 | depends on OLPC && PCI | 2071 | depends on OLPC && MFD_CS5535 |
2072 | ---help--- | 2072 | ---help--- |
2073 | Add support for non-essential features of the OLPC XO-1 laptop. | 2073 | Add support for non-essential features of the OLPC XO-1 laptop. |
2074 | 2074 | ||