aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/Kconfig42
-rw-r--r--drivers/misc/Makefile1
2 files changed, 21 insertions, 22 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fee7304102af..dcf61690bd28 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -120,7 +120,7 @@ config TIFM_CORE
120 cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD 120 cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
121 Interface support (MMC_TIFM_SD)'. 121 Interface support (MMC_TIFM_SD)'.
122 122
123 To compile this driver as a module, choose M here: the module will 123 To compile this driver as a module, choose M here: the module will
124 be called tifm_core. 124 be called tifm_core.
125 125
126config TIFM_7XX1 126config TIFM_7XX1
@@ -133,11 +133,11 @@ config TIFM_7XX1
133 To make actual use of the device, you will have to select some 133 To make actual use of the device, you will have to select some
134 flash card format drivers, as outlined in the TIFM_CORE Help. 134 flash card format drivers, as outlined in the TIFM_CORE Help.
135 135
136 To compile this driver as a module, choose M here: the module will 136 To compile this driver as a module, choose M here: the module will
137 be called tifm_7xx1. 137 be called tifm_7xx1.
138 138
139config ACER_WMI 139config ACER_WMI
140 tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" 140 tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
141 depends on X86 141 depends on X86
142 depends on EXPERIMENTAL 142 depends on EXPERIMENTAL
143 depends on ACPI 143 depends on ACPI
@@ -159,14 +159,14 @@ config ACER_WMI
159 here. 159 here.
160 160
161config ASUS_LAPTOP 161config ASUS_LAPTOP
162 tristate "Asus Laptop Extras (EXPERIMENTAL)" 162 tristate "Asus Laptop Extras (EXPERIMENTAL)"
163 depends on X86 163 depends on X86
164 depends on ACPI 164 depends on ACPI
165 depends on EXPERIMENTAL && !ACPI_ASUS 165 depends on EXPERIMENTAL && !ACPI_ASUS
166 depends on LEDS_CLASS 166 depends on LEDS_CLASS
167 depends on NEW_LEDS 167 depends on NEW_LEDS
168 depends on BACKLIGHT_CLASS_DEVICE 168 depends on BACKLIGHT_CLASS_DEVICE
169 ---help--- 169 ---help---
170 This is the new Linux driver for Asus laptops. It may also support some 170 This is the new Linux driver for Asus laptops. It may also support some
171 MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate 171 MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
172 standard ACPI events that go through /proc/acpi/events. It also adds 172 standard ACPI events that go through /proc/acpi/events. It also adds
@@ -179,12 +179,12 @@ config ASUS_LAPTOP
179 If you have an ACPI-compatible ASUS laptop, say Y or M here. 179 If you have an ACPI-compatible ASUS laptop, say Y or M here.
180 180
181config FUJITSU_LAPTOP 181config FUJITSU_LAPTOP
182 tristate "Fujitsu Laptop Extras" 182 tristate "Fujitsu Laptop Extras"
183 depends on X86 183 depends on X86
184 depends on ACPI 184 depends on ACPI
185 depends on INPUT 185 depends on INPUT
186 depends on BACKLIGHT_CLASS_DEVICE 186 depends on BACKLIGHT_CLASS_DEVICE
187 ---help--- 187 ---help---
188 This is a driver for laptops built by Fujitsu: 188 This is a driver for laptops built by Fujitsu:
189 189
190 * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks 190 * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
@@ -221,11 +221,11 @@ config HP_WMI
221 depends on INPUT 221 depends on INPUT
222 depends on RFKILL 222 depends on RFKILL
223 help 223 help
224 Say Y here if you want to support WMI-based hotkeys on HP laptops and 224 Say Y here if you want to support WMI-based hotkeys on HP laptops and
225 to read data from WMI such as docking or ambient light sensor state. 225 to read data from WMI such as docking or ambient light sensor state.
226 226
227 To compile this driver as a module, choose M here: the module will 227 To compile this driver as a module, choose M here: the module will
228 be called hp-wmi. 228 be called hp-wmi.
229 229
230config ICS932S401 230config ICS932S401
231 tristate "Integrated Circuits ICS932S401" 231 tristate "Integrated Circuits ICS932S401"
@@ -238,11 +238,11 @@ config ICS932S401
238 will be called ics932s401. 238 will be called ics932s401.
239 239
240config MSI_LAPTOP 240config MSI_LAPTOP
241 tristate "MSI Laptop Extras" 241 tristate "MSI Laptop Extras"
242 depends on X86 242 depends on X86
243 depends on ACPI 243 depends on ACPI
244 depends on BACKLIGHT_CLASS_DEVICE 244 depends on BACKLIGHT_CLASS_DEVICE
245 ---help--- 245 ---help---
246 This is a driver for laptops built by MSI (MICRO-STAR 246 This is a driver for laptops built by MSI (MICRO-STAR
247 INTERNATIONAL): 247 INTERNATIONAL):
248 248
@@ -259,7 +259,7 @@ config MSI_LAPTOP
259config PANASONIC_LAPTOP 259config PANASONIC_LAPTOP
260 tristate "Panasonic Laptop Extras" 260 tristate "Panasonic Laptop Extras"
261 depends on X86 && INPUT && ACPI 261 depends on X86 && INPUT && ACPI
262 depends on BACKLIGHT_CLASS_DEVICE 262 depends on BACKLIGHT_CLASS_DEVICE
263 ---help--- 263 ---help---
264 This driver adds support for access to backlight control and hotkeys 264 This driver adds support for access to backlight control and hotkeys
265 on Panasonic Let's Note laptops. 265 on Panasonic Let's Note laptops.
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 817f7f5ab3bd..027e1eae7c89 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,7 +1,6 @@
1# 1#
2# Makefile for misc devices that really don't fit anywhere else. 2# Makefile for misc devices that really don't fit anywhere else.
3# 3#
4obj- := misc.o # Dummy rule to force built-in.o to be made
5 4
6obj-$(CONFIG_IBM_ASM) += ibmasm/ 5obj-$(CONFIG_IBM_ASM) += ibmasm/
7obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ 6obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/