Add patches accepted for 2.6.29-rc2
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.29-rc2 / 0002-create-drivers-platform-x86-from-drivers-misc.patch
blob3656d9bf77ed30dfc4a5a7d51d3bc7bcb1ead4fd
1 From 41b16dce390510f550a4d2b12b98e0258bbed6e2 Mon Sep 17 00:00:00 2001
2 From: Len Brown <len.brown@intel.com>
3 Date: Mon, 1 Dec 2008 00:09:47 -0500
4 Subject: create drivers/platform/x86/ from drivers/misc/
6 Move x86 platform specific drivers from drivers/misc/
7 to a new home under drivers/platform/x86/.
9 The community has been maintaining x86 vendor-specific
10 platform specific drivers under /drivers/misc/ for a few years.
11 The oldest ones started life under drivers/acpi.
12 They moved out of drivers/acpi/ because they don't actually
13 implement the ACPI specification, but either simply
14 use ACPI, or implement vendor-specific ACPI extensions.
16 In the future we anticipate...
17 drivers/misc/ will go away.
18 other architectures will create drivers/platform/<arch>
20 Signed-off-by: Len Brown <len.brown@intel.com>
21 ---
22 drivers/Kconfig | 2 +
23 drivers/Makefile | 1 +
24 drivers/misc/Kconfig | 280 --------------------
25 drivers/misc/Makefile | 12 -
26 drivers/platform/Kconfig | 5 +
27 drivers/platform/Makefile | 5 +
28 drivers/platform/x86/Kconfig | 290 +++++++++++++++++++++
29 drivers/platform/x86/Makefile | 16 ++
30 drivers/{misc => platform/x86}/acer-wmi.c | 0
31 drivers/{misc => platform/x86}/asus-laptop.c | 0
32 drivers/{misc => platform/x86}/compal-laptop.c | 0
33 drivers/{misc => platform/x86}/eeepc-laptop.c | 0
34 drivers/{misc => platform/x86}/fujitsu-laptop.c | 0
35 drivers/{misc => platform/x86}/hp-wmi.c | 0
36 drivers/{misc => platform/x86}/intel_menlow.c | 0
37 drivers/{misc => platform/x86}/msi-laptop.c | 0
38 drivers/{misc => platform/x86}/panasonic-laptop.c | 0
39 drivers/{misc => platform/x86}/sony-laptop.c | 0
40 drivers/{misc => platform/x86}/tc1100-wmi.c | 0
41 drivers/{misc => platform/x86}/thinkpad_acpi.c | 0
42 20 files changed, 319 insertions(+), 292 deletions(-)
43 create mode 100644 drivers/platform/Kconfig
44 create mode 100644 drivers/platform/Makefile
45 create mode 100644 drivers/platform/x86/Kconfig
46 create mode 100644 drivers/platform/x86/Makefile
47 rename drivers/{misc => platform/x86}/acer-wmi.c (100%)
48 rename drivers/{misc => platform/x86}/asus-laptop.c (100%)
49 rename drivers/{misc => platform/x86}/compal-laptop.c (100%)
50 rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%)
51 rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%)
52 rename drivers/{misc => platform/x86}/hp-wmi.c (100%)
53 rename drivers/{misc => platform/x86}/intel_menlow.c (100%)
54 rename drivers/{misc => platform/x86}/msi-laptop.c (100%)
55 rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%)
56 rename drivers/{misc => platform/x86}/sony-laptop.c (100%)
57 rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%)
58 rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%)
60 diff --git a/drivers/Kconfig b/drivers/Kconfig
61 index 2f557f5..00cf955 100644
62 --- a/drivers/Kconfig
63 +++ b/drivers/Kconfig
64 @@ -107,4 +107,6 @@ source "drivers/uio/Kconfig"
65 source "drivers/xen/Kconfig"
67 source "drivers/staging/Kconfig"
69 +source "drivers/platform/Kconfig"
70 endmenu
71 diff --git a/drivers/Makefile b/drivers/Makefile
72 index fceb71a..46d4828 100644
73 --- a/drivers/Makefile
74 +++ b/drivers/Makefile
75 @@ -102,3 +102,4 @@ obj-$(CONFIG_SSB) += ssb/
76 obj-$(CONFIG_VIRTIO) += virtio/
77 obj-$(CONFIG_REGULATOR) += regulator/
78 obj-$(CONFIG_STAGING) += staging/
79 +obj-y += platform/
80 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
81 index dcf6169..8574879 100644
82 --- a/drivers/misc/Kconfig
83 +++ b/drivers/misc/Kconfig
84 @@ -136,97 +136,6 @@ config TIFM_7XX1
85 To compile this driver as a module, choose M here: the module will
86 be called tifm_7xx1.
88 -config ACER_WMI
89 - tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
90 - depends on X86
91 - depends on EXPERIMENTAL
92 - depends on ACPI
93 - depends on LEDS_CLASS
94 - depends on NEW_LEDS
95 - depends on BACKLIGHT_CLASS_DEVICE
96 - depends on SERIO_I8042
97 - depends on RFKILL
98 - select ACPI_WMI
99 - ---help---
100 - This is a driver for newer Acer (and Wistron) laptops. It adds
101 - wireless radio and bluetooth control, and on some laptops,
102 - exposes the mail LED and LCD backlight.
104 - For more information about this driver see
105 - <file:Documentation/laptops/acer-wmi.txt>
107 - If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
108 - here.
110 -config ASUS_LAPTOP
111 - tristate "Asus Laptop Extras (EXPERIMENTAL)"
112 - depends on X86
113 - depends on ACPI
114 - depends on EXPERIMENTAL && !ACPI_ASUS
115 - depends on LEDS_CLASS
116 - depends on NEW_LEDS
117 - depends on BACKLIGHT_CLASS_DEVICE
118 - ---help---
119 - This is the new Linux driver for Asus laptops. It may also support some
120 - MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
121 - standard ACPI events that go through /proc/acpi/events. It also adds
122 - support for video output switching, LCD backlight control, Bluetooth and
123 - Wlan control, and most importantly, allows you to blink those fancy LEDs.
125 - For more information and a userspace daemon for handling the extra
126 - buttons see <http://acpi4asus.sf.net/>.
128 - If you have an ACPI-compatible ASUS laptop, say Y or M here.
130 -config FUJITSU_LAPTOP
131 - tristate "Fujitsu Laptop Extras"
132 - depends on X86
133 - depends on ACPI
134 - depends on INPUT
135 - depends on BACKLIGHT_CLASS_DEVICE
136 - ---help---
137 - This is a driver for laptops built by Fujitsu:
139 - * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
140 - * Possibly other Fujitsu laptop models
141 - * Tested with S6410 and S7020
143 - It adds support for LCD brightness control and some hotkeys.
145 - If you have a Fujitsu laptop, say Y or M here.
147 -config FUJITSU_LAPTOP_DEBUG
148 - bool "Verbose debug mode for Fujitsu Laptop Extras"
149 - depends on FUJITSU_LAPTOP
150 - default n
151 - ---help---
152 - Enables extra debug output from the fujitsu extras driver, at the
153 - expense of a slight increase in driver size.
155 - If you are not sure, say N here.
157 -config TC1100_WMI
158 - tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
159 - depends on X86 && !X86_64
160 - depends on EXPERIMENTAL
161 - depends on ACPI
162 - select ACPI_WMI
163 - ---help---
164 - This is a driver for the WMI extensions (wireless and bluetooth power
165 - control) of the HP Compaq TC1100 tablet.
167 -config HP_WMI
168 - tristate "HP WMI extras"
169 - depends on ACPI_WMI
170 - depends on INPUT
171 - depends on RFKILL
172 - help
173 - Say Y here if you want to support WMI-based hotkeys on HP laptops and
174 - to read data from WMI such as docking or ambient light sensor state.
176 - To compile this driver as a module, choose M here: the module will
177 - be called hp-wmi.
179 config ICS932S401
180 tristate "Integrated Circuits ICS932S401"
181 depends on I2C && EXPERIMENTAL
182 @@ -237,170 +146,6 @@ config ICS932S401
183 This driver can also be built as a module. If so, the module
184 will be called ics932s401.
186 -config MSI_LAPTOP
187 - tristate "MSI Laptop Extras"
188 - depends on X86
189 - depends on ACPI
190 - depends on BACKLIGHT_CLASS_DEVICE
191 - ---help---
192 - This is a driver for laptops built by MSI (MICRO-STAR
193 - INTERNATIONAL):
195 - MSI MegaBook S270 (MS-1013)
196 - Cytron/TCM/Medion/Tchibo MD96100/SAM2000
198 - It adds support for Bluetooth, WLAN and LCD brightness control.
200 - More information about this driver is available at
201 - <http://0pointer.de/lennart/tchibo.html>.
203 - If you have an MSI S270 laptop, say Y or M here.
205 -config PANASONIC_LAPTOP
206 - tristate "Panasonic Laptop Extras"
207 - depends on X86 && INPUT && ACPI
208 - depends on BACKLIGHT_CLASS_DEVICE
209 - ---help---
210 - This driver adds support for access to backlight control and hotkeys
211 - on Panasonic Let's Note laptops.
213 - If you have a Panasonic Let's note laptop (such as the R1(N variant),
214 - R2, R3, R5, T2, W2 and Y2 series), say Y.
216 -config COMPAL_LAPTOP
217 - tristate "Compal Laptop Extras"
218 - depends on X86
219 - depends on ACPI
220 - depends on BACKLIGHT_CLASS_DEVICE
221 - ---help---
222 - This is a driver for laptops built by Compal:
224 - Compal FL90/IFL90
225 - Compal FL91/IFL91
226 - Compal FL92/JFL92
227 - Compal FT00/IFT00
229 - It adds support for Bluetooth, WLAN and LCD brightness control.
231 - If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
233 -config SONY_LAPTOP
234 - tristate "Sony Laptop Extras"
235 - depends on X86 && ACPI
236 - select BACKLIGHT_CLASS_DEVICE
237 - depends on INPUT
238 - ---help---
239 - This mini-driver drives the SNC and SPIC devices present in the ACPI
240 - BIOS of the Sony Vaio laptops.
242 - It gives access to some extra laptop functionalities like Bluetooth,
243 - screen brightness control, Fn keys and allows powering on/off some
244 - devices.
246 - Read <file:Documentation/laptops/sony-laptop.txt> for more information.
248 -config SONYPI_COMPAT
249 - bool "Sonypi compatibility"
250 - depends on SONY_LAPTOP
251 - ---help---
252 - Build the sonypi driver compatibility code into the sony-laptop driver.
254 -config THINKPAD_ACPI
255 - tristate "ThinkPad ACPI Laptop Extras"
256 - depends on X86 && ACPI
257 - select BACKLIGHT_LCD_SUPPORT
258 - select BACKLIGHT_CLASS_DEVICE
259 - select HWMON
260 - select NVRAM
261 - select INPUT
262 - select NEW_LEDS
263 - select LEDS_CLASS
264 - select NET
265 - select RFKILL
266 - ---help---
267 - This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
268 - support for Fn-Fx key combinations, Bluetooth control, video
269 - output switching, ThinkLight control, UltraBay eject and more.
270 - For more information about this driver see
271 - <file:Documentation/laptops/thinkpad-acpi.txt> and
272 - <http://ibm-acpi.sf.net/> .
274 - This driver was formerly known as ibm-acpi.
276 - If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
278 -config THINKPAD_ACPI_DEBUG
279 - bool "Verbose debug mode"
280 - depends on THINKPAD_ACPI
281 - default n
282 - ---help---
283 - Enables extra debugging information, at the expense of a slightly
284 - increase in driver size.
286 - If you are not sure, say N here.
288 -config THINKPAD_ACPI_DOCK
289 - bool "Legacy Docking Station Support"
290 - depends on THINKPAD_ACPI
291 - depends on ACPI_DOCK=n
292 - default n
293 - ---help---
294 - Allows the thinkpad_acpi driver to handle docking station events.
295 - This support was made obsolete by the generic ACPI docking station
296 - support (CONFIG_ACPI_DOCK). It will allow locking and removing the
297 - laptop from the docking station, but will not properly connect PCI
298 - devices.
300 - If you are not sure, say N here.
302 -config THINKPAD_ACPI_BAY
303 - bool "Legacy Removable Bay Support"
304 - depends on THINKPAD_ACPI
305 - default y
306 - ---help---
307 - Allows the thinkpad_acpi driver to handle removable bays. It will
308 - electrically disable the device in the bay, and also generate
309 - notifications when the bay lever is ejected or inserted.
311 - If you are not sure, say Y here.
313 -config THINKPAD_ACPI_VIDEO
314 - bool "Video output control support"
315 - depends on THINKPAD_ACPI
316 - default y
317 - ---help---
318 - Allows the thinkpad_acpi driver to provide an interface to control
319 - the various video output ports.
321 - This feature often won't work well, depending on ThinkPad model,
322 - display state, video output devices in use, whether there is a X
323 - server running, phase of the moon, and the current mood of
324 - Schroedinger's cat. If you can use X.org's RandR to control
325 - your ThinkPad's video output ports instead of this feature,
326 - don't think twice: do it and say N here to save some memory.
328 - If you are not sure, say Y here.
330 -config THINKPAD_ACPI_HOTKEY_POLL
331 - bool "Support NVRAM polling for hot keys"
332 - depends on THINKPAD_ACPI
333 - default y
334 - ---help---
335 - Some thinkpad models benefit from NVRAM polling to detect a few of
336 - the hot key press events. If you know your ThinkPad model does not
337 - need to do NVRAM polling to support any of the hot keys you use,
338 - unselecting this option will save about 1kB of memory.
340 - ThinkPads T40 and newer, R52 and newer, and X31 and newer are
341 - unlikely to need NVRAM polling in their latest BIOS versions.
343 - NVRAM polling can detect at most the following keys: ThinkPad/Access
344 - IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
345 - Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
347 - If you are not sure, say Y here. The driver enables polling only if
348 - it is strictly necessary to do so.
350 config ATMEL_SSC
351 tristate "Device driver for Atmel SSC peripheral"
352 depends on AVR32 || ARCH_AT91
353 @@ -413,31 +158,6 @@ config ATMEL_SSC
355 If unsure, say N.
357 -config INTEL_MENLOW
358 - tristate "Thermal Management driver for Intel menlow platform"
359 - depends on ACPI_THERMAL
360 - select THERMAL
361 - depends on X86
362 - ---help---
363 - ACPI thermal management enhancement driver on
364 - Intel Menlow platform.
366 - If unsure, say N.
368 -config EEEPC_LAPTOP
369 - tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
370 - depends on X86
371 - depends on ACPI
372 - depends on BACKLIGHT_CLASS_DEVICE
373 - depends on HWMON
374 - depends on EXPERIMENTAL
375 - depends on RFKILL
376 - ---help---
377 - This driver supports the Fn-Fx keys on Eee PC laptops.
378 - It also adds the ability to switch camera/wlan on/off.
380 - If you have an Eee PC laptop, say Y or M here.
382 config ENCLOSURE_SERVICES
383 tristate "Enclosure Services"
384 default n
385 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
386 index 027e1ea..d5749a7 100644
387 --- a/drivers/misc/Makefile
388 +++ b/drivers/misc/Makefile
389 @@ -4,28 +4,16 @@
391 obj-$(CONFIG_IBM_ASM) += ibmasm/
392 obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
393 -obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
394 -obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
395 -obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
396 -obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o
397 -obj-$(CONFIG_ACER_WMI) += acer-wmi.o
398 obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o
399 obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
400 obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
401 -obj-$(CONFIG_HP_WMI) += hp-wmi.o
402 obj-$(CONFIG_ICS932S401) += ics932s401.o
403 -obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
404 obj-$(CONFIG_LKDTM) += lkdtm.o
405 obj-$(CONFIG_TIFM_CORE) += tifm_core.o
406 obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
407 obj-$(CONFIG_PHANTOM) += phantom.o
408 obj-$(CONFIG_SGI_IOC4) += ioc4.o
409 -obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
410 -obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
411 -obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
412 -obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
413 obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
414 -obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
415 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
416 obj-$(CONFIG_KGDB_TESTS) += kgdbts.o
417 obj-$(CONFIG_SGI_XP) += sgi-xp/
418 diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
419 new file mode 100644
420 index 0000000..9652c3f
421 --- /dev/null
422 +++ b/drivers/platform/Kconfig
423 @@ -0,0 +1,5 @@
424 +# drivers/platform/Kconfig
426 +if X86
427 +source "drivers/platform/x86/Kconfig"
428 +endif
429 diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
430 new file mode 100644
431 index 0000000..782953a
432 --- /dev/null
433 +++ b/drivers/platform/Makefile
434 @@ -0,0 +1,5 @@
436 +# Makefile for linux/drivers/platform
439 +obj-$(CONFIG_X86) += x86/
440 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
441 new file mode 100644
442 index 0000000..0a9a5b9
443 --- /dev/null
444 +++ b/drivers/platform/x86/Kconfig
445 @@ -0,0 +1,290 @@
447 +# X86 Platform Specific Drivers
450 +menuconfig X86_PLATFORM_DEVICES
451 + bool "X86 Platform Specific Device Drivers"
452 + default y
453 + ---help---
454 + Say Y here to get to see options for device drivers for various
455 + x86 platforms, including vendor-specific laptop extension drivers.
456 + This option alone does not add any kernel code.
458 + If you say N, all options in this submenu will be skipped and disabled.
460 +if X86_PLATFORM_DEVICES
462 +config ACER_WMI
463 + tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
464 + depends on EXPERIMENTAL
465 + depends on ACPI
466 + depends on LEDS_CLASS
467 + depends on NEW_LEDS
468 + depends on BACKLIGHT_CLASS_DEVICE
469 + depends on SERIO_I8042
470 + depends on RFKILL
471 + select ACPI_WMI
472 + ---help---
473 + This is a driver for newer Acer (and Wistron) laptops. It adds
474 + wireless radio and bluetooth control, and on some laptops,
475 + exposes the mail LED and LCD backlight.
477 + For more information about this driver see
478 + <file:Documentation/laptops/acer-wmi.txt>
480 + If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
481 + here.
483 +config ASUS_LAPTOP
484 + tristate "Asus Laptop Extras (EXPERIMENTAL)"
485 + depends on ACPI
486 + depends on EXPERIMENTAL && !ACPI_ASUS
487 + depends on LEDS_CLASS
488 + depends on NEW_LEDS
489 + depends on BACKLIGHT_CLASS_DEVICE
490 + ---help---
491 + This is the new Linux driver for Asus laptops. It may also support some
492 + MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
493 + standard ACPI events that go through /proc/acpi/events. It also adds
494 + support for video output switching, LCD backlight control, Bluetooth and
495 + Wlan control, and most importantly, allows you to blink those fancy LEDs.
497 + For more information and a userspace daemon for handling the extra
498 + buttons see <http://acpi4asus.sf.net/>.
500 + If you have an ACPI-compatible ASUS laptop, say Y or M here.
502 +config FUJITSU_LAPTOP
503 + tristate "Fujitsu Laptop Extras"
504 + depends on ACPI
505 + depends on INPUT
506 + depends on BACKLIGHT_CLASS_DEVICE
507 + ---help---
508 + This is a driver for laptops built by Fujitsu:
510 + * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
511 + * Possibly other Fujitsu laptop models
512 + * Tested with S6410 and S7020
514 + It adds support for LCD brightness control and some hotkeys.
516 + If you have a Fujitsu laptop, say Y or M here.
518 +config FUJITSU_LAPTOP_DEBUG
519 + bool "Verbose debug mode for Fujitsu Laptop Extras"
520 + depends on FUJITSU_LAPTOP
521 + default n
522 + ---help---
523 + Enables extra debug output from the fujitsu extras driver, at the
524 + expense of a slight increase in driver size.
526 + If you are not sure, say N here.
528 +config TC1100_WMI
529 + tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
530 + depends on !X86_64
531 + depends on EXPERIMENTAL
532 + depends on ACPI
533 + select ACPI_WMI
534 + ---help---
535 + This is a driver for the WMI extensions (wireless and bluetooth power
536 + control) of the HP Compaq TC1100 tablet.
538 +config HP_WMI
539 + tristate "HP WMI extras"
540 + depends on ACPI_WMI
541 + depends on INPUT
542 + depends on RFKILL
543 + help
544 + Say Y here if you want to support WMI-based hotkeys on HP laptops and
545 + to read data from WMI such as docking or ambient light sensor state.
547 + To compile this driver as a module, choose M here: the module will
548 + be called hp-wmi.
550 +config MSI_LAPTOP
551 + tristate "MSI Laptop Extras"
552 + depends on ACPI
553 + depends on BACKLIGHT_CLASS_DEVICE
554 + ---help---
555 + This is a driver for laptops built by MSI (MICRO-STAR
556 + INTERNATIONAL):
558 + MSI MegaBook S270 (MS-1013)
559 + Cytron/TCM/Medion/Tchibo MD96100/SAM2000
561 + It adds support for Bluetooth, WLAN and LCD brightness control.
563 + More information about this driver is available at
564 + <http://0pointer.de/lennart/tchibo.html>.
566 + If you have an MSI S270 laptop, say Y or M here.
568 +config PANASONIC_LAPTOP
569 + tristate "Panasonic Laptop Extras"
570 + depends on INPUT && ACPI
571 + depends on BACKLIGHT_CLASS_DEVICE
572 + ---help---
573 + This driver adds support for access to backlight control and hotkeys
574 + on Panasonic Let's Note laptops.
576 + If you have a Panasonic Let's note laptop (such as the R1(N variant),
577 + R2, R3, R5, T2, W2 and Y2 series), say Y.
579 +config COMPAL_LAPTOP
580 + tristate "Compal Laptop Extras"
581 + depends on ACPI
582 + depends on BACKLIGHT_CLASS_DEVICE
583 + ---help---
584 + This is a driver for laptops built by Compal:
586 + Compal FL90/IFL90
587 + Compal FL91/IFL91
588 + Compal FL92/JFL92
589 + Compal FT00/IFT00
591 + It adds support for Bluetooth, WLAN and LCD brightness control.
593 + If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
595 +config SONY_LAPTOP
596 + tristate "Sony Laptop Extras"
597 + depends on ACPI
598 + select BACKLIGHT_CLASS_DEVICE
599 + depends on INPUT
600 + ---help---
601 + This mini-driver drives the SNC and SPIC devices present in the ACPI
602 + BIOS of the Sony Vaio laptops.
604 + It gives access to some extra laptop functionalities like Bluetooth,
605 + screen brightness control, Fn keys and allows powering on/off some
606 + devices.
608 + Read <file:Documentation/laptops/sony-laptop.txt> for more information.
610 +config SONYPI_COMPAT
611 + bool "Sonypi compatibility"
612 + depends on SONY_LAPTOP
613 + ---help---
614 + Build the sonypi driver compatibility code into the sony-laptop driver.
616 +config THINKPAD_ACPI
617 + tristate "ThinkPad ACPI Laptop Extras"
618 + depends on ACPI
619 + select BACKLIGHT_LCD_SUPPORT
620 + select BACKLIGHT_CLASS_DEVICE
621 + select HWMON
622 + select NVRAM
623 + select INPUT
624 + select NEW_LEDS
625 + select LEDS_CLASS
626 + select NET
627 + select RFKILL
628 + ---help---
629 + This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
630 + support for Fn-Fx key combinations, Bluetooth control, video
631 + output switching, ThinkLight control, UltraBay eject and more.
632 + For more information about this driver see
633 + <file:Documentation/laptops/thinkpad-acpi.txt> and
634 + <http://ibm-acpi.sf.net/> .
636 + This driver was formerly known as ibm-acpi.
638 + If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
640 +config THINKPAD_ACPI_DEBUG
641 + bool "Verbose debug mode"
642 + depends on THINKPAD_ACPI
643 + default n
644 + ---help---
645 + Enables extra debugging information, at the expense of a slightly
646 + increase in driver size.
648 + If you are not sure, say N here.
650 +config THINKPAD_ACPI_DOCK
651 + bool "Legacy Docking Station Support"
652 + depends on THINKPAD_ACPI
653 + depends on ACPI_DOCK=n
654 + default n
655 + ---help---
656 + Allows the thinkpad_acpi driver to handle docking station events.
657 + This support was made obsolete by the generic ACPI docking station
658 + support (CONFIG_ACPI_DOCK). It will allow locking and removing the
659 + laptop from the docking station, but will not properly connect PCI
660 + devices.
662 + If you are not sure, say N here.
664 +config THINKPAD_ACPI_BAY
665 + bool "Legacy Removable Bay Support"
666 + depends on THINKPAD_ACPI
667 + default y
668 + ---help---
669 + Allows the thinkpad_acpi driver to handle removable bays. It will
670 + electrically disable the device in the bay, and also generate
671 + notifications when the bay lever is ejected or inserted.
673 + If you are not sure, say Y here.
675 +config THINKPAD_ACPI_VIDEO
676 + bool "Video output control support"
677 + depends on THINKPAD_ACPI
678 + default y
679 + ---help---
680 + Allows the thinkpad_acpi driver to provide an interface to control
681 + the various video output ports.
683 + This feature often won't work well, depending on ThinkPad model,
684 + display state, video output devices in use, whether there is a X
685 + server running, phase of the moon, and the current mood of
686 + Schroedinger's cat. If you can use X.org's RandR to control
687 + your ThinkPad's video output ports instead of this feature,
688 + don't think twice: do it and say N here to save some memory.
690 + If you are not sure, say Y here.
692 +config THINKPAD_ACPI_HOTKEY_POLL
693 + bool "Support NVRAM polling for hot keys"
694 + depends on THINKPAD_ACPI
695 + default y
696 + ---help---
697 + Some thinkpad models benefit from NVRAM polling to detect a few of
698 + the hot key press events. If you know your ThinkPad model does not
699 + need to do NVRAM polling to support any of the hot keys you use,
700 + unselecting this option will save about 1kB of memory.
702 + ThinkPads T40 and newer, R52 and newer, and X31 and newer are
703 + unlikely to need NVRAM polling in their latest BIOS versions.
705 + NVRAM polling can detect at most the following keys: ThinkPad/Access
706 + IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
707 + Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
709 + If you are not sure, say Y here. The driver enables polling only if
710 + it is strictly necessary to do so.
712 +config INTEL_MENLOW
713 + tristate "Thermal Management driver for Intel menlow platform"
714 + depends on ACPI_THERMAL
715 + select THERMAL
716 + ---help---
717 + ACPI thermal management enhancement driver on
718 + Intel Menlow platform.
720 + If unsure, say N.
722 +config EEEPC_LAPTOP
723 + tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
724 + depends on ACPI
725 + depends on BACKLIGHT_CLASS_DEVICE
726 + depends on HWMON
727 + depends on EXPERIMENTAL
728 + depends on RFKILL
729 + ---help---
730 + This driver supports the Fn-Fx keys on Eee PC laptops.
731 + It also adds the ability to switch camera/wlan on/off.
733 + If you have an Eee PC laptop, say Y or M here.
735 +endif # X86_PLATFORM_DEVICES
736 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
737 new file mode 100644
738 index 0000000..4d26b1b
739 --- /dev/null
740 +++ b/drivers/platform/x86/Makefile
741 @@ -0,0 +1,16 @@
743 +# Makefile for linux/drivers/platform/x86
744 +# x86 Platform-Specific Drivers
746 +obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
747 +obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
748 +obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
749 +obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o
750 +obj-$(CONFIG_ACER_WMI) += acer-wmi.o
751 +obj-$(CONFIG_HP_WMI) += hp-wmi.o
752 +obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
753 +obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
754 +obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
755 +obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
756 +obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
757 +obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
758 diff --git a/drivers/misc/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
759 similarity index 100%
760 rename from drivers/misc/acer-wmi.c
761 rename to drivers/platform/x86/acer-wmi.c
762 diff --git a/drivers/misc/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
763 similarity index 100%
764 rename from drivers/misc/asus-laptop.c
765 rename to drivers/platform/x86/asus-laptop.c
766 diff --git a/drivers/misc/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
767 similarity index 100%
768 rename from drivers/misc/compal-laptop.c
769 rename to drivers/platform/x86/compal-laptop.c
770 diff --git a/drivers/misc/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
771 similarity index 100%
772 rename from drivers/misc/eeepc-laptop.c
773 rename to drivers/platform/x86/eeepc-laptop.c
774 diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
775 similarity index 100%
776 rename from drivers/misc/fujitsu-laptop.c
777 rename to drivers/platform/x86/fujitsu-laptop.c
778 diff --git a/drivers/misc/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
779 similarity index 100%
780 rename from drivers/misc/hp-wmi.c
781 rename to drivers/platform/x86/hp-wmi.c
782 diff --git a/drivers/misc/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
783 similarity index 100%
784 rename from drivers/misc/intel_menlow.c
785 rename to drivers/platform/x86/intel_menlow.c
786 diff --git a/drivers/misc/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
787 similarity index 100%
788 rename from drivers/misc/msi-laptop.c
789 rename to drivers/platform/x86/msi-laptop.c
790 diff --git a/drivers/misc/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
791 similarity index 100%
792 rename from drivers/misc/panasonic-laptop.c
793 rename to drivers/platform/x86/panasonic-laptop.c
794 diff --git a/drivers/misc/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
795 similarity index 100%
796 rename from drivers/misc/sony-laptop.c
797 rename to drivers/platform/x86/sony-laptop.c
798 diff --git a/drivers/misc/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
799 similarity index 100%
800 rename from drivers/misc/tc1100-wmi.c
801 rename to drivers/platform/x86/tc1100-wmi.c
802 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
803 similarity index 100%
804 rename from drivers/misc/thinkpad_acpi.c
805 rename to drivers/platform/x86/thinkpad_acpi.c
807 1.5.6.5