projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'platform-drivers-x86-v4.8-1' of git://git.infradead.org/users/dvhart/linux...
[linux-2.6-block.git]
/
drivers
/
platform
/
x86
/
Kconfig
diff --git
a/drivers/platform/x86/Kconfig
b/drivers/platform/x86/Kconfig
index bdf027716f3ebd40e3daa2d23e25706f3b411a80..81b8dcca8891dc00ca5d0cb48c28329d25e70887 100644
(file)
--- a/
drivers/platform/x86/Kconfig
+++ b/
drivers/platform/x86/Kconfig
@@
-103,7
+103,6
@@
config DELL_SMBIOS
config DELL_LAPTOP
tristate "Dell Laptop Extras"
config DELL_LAPTOP
tristate "Dell Laptop Extras"
- depends on X86
depends on DELL_SMBIOS
depends on DMI
depends on BACKLIGHT_CLASS_DEVICE
depends on DELL_SMBIOS
depends on DMI
depends on BACKLIGHT_CLASS_DEVICE
@@
-505,7
+504,7
@@
config THINKPAD_ACPI_HOTKEY_POLL
config SENSORS_HDAPS
tristate "Thinkpad Hard Drive Active Protection System (hdaps)"
config SENSORS_HDAPS
tristate "Thinkpad Hard Drive Active Protection System (hdaps)"
- depends on INPUT
&& X86
+ depends on INPUT
select INPUT_POLLDEV
default n
help
select INPUT_POLLDEV
default n
help
@@
-752,7
+751,7
@@
config TOSHIBA_WMI
config ACPI_CMPC
tristate "CMPC Laptop Extras"
config ACPI_CMPC
tristate "CMPC Laptop Extras"
- depends on
X86 &&
ACPI
+ depends on ACPI
depends on RFKILL || RFKILL=n
select INPUT
select BACKLIGHT_CLASS_DEVICE
depends on RFKILL || RFKILL=n
select INPUT
select BACKLIGHT_CLASS_DEVICE
@@
-863,7
+862,7
@@
config INTEL_IMR
config INTEL_PMC_CORE
bool "Intel PMC Core driver"
config INTEL_PMC_CORE
bool "Intel PMC Core driver"
- depends on
X86 &&
PCI
+ depends on PCI
---help---
The Intel Platform Controller Hub for Intel Core SoCs provides access
to Power Management Controller registers via a PCI interface. This
---help---
The Intel Platform Controller Hub for Intel Core SoCs provides access
to Power Management Controller registers via a PCI interface. This
@@
-875,7
+874,7
@@
config INTEL_PMC_CORE
config IBM_RTL
tristate "Device driver to enable PRTL support"
config IBM_RTL
tristate "Device driver to enable PRTL support"
- depends on
X86 &&
PCI
+ depends on PCI
---help---
Enable support for IBM Premium Real Time Mode (PRTM).
This module will allow you the enter and exit PRTM in the BIOS via
---help---
Enable support for IBM Premium Real Time Mode (PRTM).
This module will allow you the enter and exit PRTM in the BIOS via
@@
-909,7
+908,6
@@
config XO15_EBOOK
config SAMSUNG_LAPTOP
tristate "Samsung Laptop driver"
config SAMSUNG_LAPTOP
tristate "Samsung Laptop driver"
- depends on X86
depends on RFKILL || RFKILL = n
depends on ACPI_VIDEO || ACPI_VIDEO = n
depends on BACKLIGHT_CLASS_DEVICE
depends on RFKILL || RFKILL = n
depends on ACPI_VIDEO || ACPI_VIDEO = n
depends on BACKLIGHT_CLASS_DEVICE